diff options
Diffstat (limited to 'app/Controllers')
| -rw-r--r-- | app/Controllers/feedController.php | 8 | ||||
| -rw-r--r-- | app/Controllers/subscriptionController.php | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index d1d506c0d..5e364ffcd 100644 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -259,7 +259,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { if (!empty($xPathSettings)) { $attributes['xpath'] = $xPathSettings; } - } elseif ($feed_kind === FreshRSS_Feed::KIND_JSON_DOTPATH) { + } elseif ($feed_kind === FreshRSS_Feed::KIND_JSON_DOTNOTATION) { $jsonSettings = []; if (Minz_Request::paramString('jsonFeedTitle') !== '') { $jsonSettings['feedTitle'] = Minz_Request::paramString('jsonFeedTitle', true); @@ -295,7 +295,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { $jsonSettings['itemUid'] = Minz_Request::paramString('jsonItemUid', true); } if (!empty($jsonSettings)) { - $attributes['json_dotpath'] = $jsonSettings; + $attributes['json_dotnotation'] = $jsonSettings; } } @@ -497,10 +497,10 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { if ($simplePie === null) { throw new FreshRSS_Feed_Exception('XML+XPath parsing failed for [' . $feed->url(false) . ']'); } - } elseif ($feed->kind() === FreshRSS_Feed::KIND_JSON_DOTPATH) { + } elseif ($feed->kind() === FreshRSS_Feed::KIND_JSON_DOTNOTATION) { $simplePie = $feed->loadJson(); if ($simplePie === null) { - throw new FreshRSS_Feed_Exception('JSON dotpath parsing failed for [' . $feed->url(false) . ']'); + throw new FreshRSS_Feed_Exception('JSON dot notation parsing failed for [' . $feed->url(false) . ']'); } } elseif ($feed->kind() === FreshRSS_Feed::KIND_JSONFEED) { $simplePie = $feed->loadJson(); diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php index 39836d1e4..af18bbced 100644 --- a/app/Controllers/subscriptionController.php +++ b/app/Controllers/subscriptionController.php @@ -238,7 +238,7 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController { $xPathSettings['itemUid'] = Minz_Request::paramString('xPathItemUid', true); if (!empty($xPathSettings)) $feed->_attribute('xpath', $xPathSettings); - } elseif ($feed->kind() === FreshRSS_Feed::KIND_JSON_DOTPATH) { + } elseif ($feed->kind() === FreshRSS_Feed::KIND_JSON_DOTNOTATION) { $jsonSettings = []; if (Minz_Request::paramString('jsonFeedTitle') !== '') { $jsonSettings['feedTitle'] = Minz_Request::paramString('jsonFeedTitle', true); @@ -274,7 +274,7 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController { $jsonSettings['itemUid'] = Minz_Request::paramString('jsonItemUid', true); } if (!empty($jsonSettings)) { - $feed->_attribute('json_dotpath', $jsonSettings); + $feed->_attribute('json_dotnotation', $jsonSettings); } } |