diff options
Diffstat (limited to 'app/Controllers')
| -rwxr-xr-x | app/Controllers/feedController.php | 8 | ||||
| -rw-r--r-- | app/Controllers/subscriptionController.php | 11 |
2 files changed, 6 insertions, 13 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index a9dc241a9..dd845bccd 100755 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -181,11 +181,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController { 'timeout' => null, 'curl_params' => empty($opts) ? null : $opts, ); - if (FreshRSS_Auth::hasAccess('admin')) { - $attributes['ssl_verify'] = Minz_Request::paramTernary('ssl_verify'); - $timeout = intval(Minz_Request::param('timeout', 0)); - $attributes['timeout'] = $timeout > 0 ? $timeout : null; - } + $attributes['ssl_verify'] = Minz_Request::paramTernary('ssl_verify'); + $timeout = intval(Minz_Request::param('timeout', 0)); + $attributes['timeout'] = $timeout > 0 ? $timeout : null; try { $feed = self::addFeed($url, '', $cat, null, $http_auth, $attributes); diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php index 879c7f905..f47988926 100644 --- a/app/Controllers/subscriptionController.php +++ b/app/Controllers/subscriptionController.php @@ -131,14 +131,9 @@ class FreshRSS_subscription_Controller extends Minz_ActionController { $feed->_attributes('content_action', Minz_Request::param('content_action', 'replace')); - if (FreshRSS_Auth::hasAccess('admin')) { - $feed->_attributes('ssl_verify', Minz_Request::paramTernary('ssl_verify')); - $timeout = intval(Minz_Request::param('timeout', 0)); - $feed->_attributes('timeout', $timeout > 0 ? $timeout : null); - } else { - $feed->_attributes('ssl_verify', null); - $feed->_attributes('timeout', null); - } + $feed->_attributes('ssl_verify', Minz_Request::paramTernary('ssl_verify')); + $timeout = intval(Minz_Request::param('timeout', 0)); + $feed->_attributes('timeout', $timeout > 0 ? $timeout : null); if (Minz_Request::paramBoolean('use_default_purge_options')) { $feed->_attributes('archiving', null); |