diff options
Diffstat (limited to 'app')
| -rwxr-xr-x | app/Controllers/configureController.php | 11 | ||||
| -rw-r--r-- | app/layout/aside_configure.phtml | 4 | ||||
| -rw-r--r-- | app/layout/header.phtml | 2 | ||||
| -rw-r--r-- | app/views/configure/integration.phtml (renamed from app/views/configure/sharing.phtml) | 0 |
4 files changed, 10 insertions, 7 deletions
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php index b38d3289a..dcb438587 100755 --- a/app/Controllers/configureController.php +++ b/app/Controllers/configureController.php @@ -134,13 +134,16 @@ class FreshRSS_configure_Controller extends Minz_ActionController { } /** - * This action handles the sharing configuration page. + * This action handles the integration configuration page. * - * It displays the sharing configuration page. + * It displays the integration configuration page. * If this action is reached through a POST request, it stores all * configuration values then sends a notification to the user. + * + * Before v1.16, we used sharing instead of integration. This has + * some unwanted behavior when the end-user was using an ad-blocker. */ - public function sharingAction() { + public function integrationAction() { if (Minz_Request::isPost()) { $params = Minz_Request::fetchPOST(); FreshRSS_Context::$user_conf->sharing = $params['share']; @@ -148,7 +151,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController { invalidateHttpCache(); Minz_Request::good(_t('feedback.conf.updated'), - array('c' => 'configure', 'a' => 'sharing')); + array('c' => 'configure', 'a' => 'integration')); } Minz_View::prependTitle(_t('conf.sharing.title') . ' ยท '); diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml index 1267f747c..e74630b5a 100644 --- a/app/layout/aside_configure.phtml +++ b/app/layout/aside_configure.phtml @@ -9,8 +9,8 @@ <li class="item<?= Minz_Request::actionName() === 'archiving' ? ' active' : '' ?>"> <a href="<?= _url('configure', 'archiving') ?>"><?= _t('gen.menu.archiving') ?></a> </li> - <li class="item<?= Minz_Request::actionName() === 'sharing' ? ' active' : '' ?>"> - <a href="<?= _url('configure', 'sharing') ?>"><?= _t('gen.menu.sharing') ?></a> + <li class="item<?= Minz_Request::actionName() === 'integration' ? ' active' : '' ?>"> + <a href="<?= _url('configure', 'integration') ?>"><?= _t('gen.menu.sharing') ?></a> </li> <li class="item<?= Minz_Request::actionName() === 'shortcut' ? ' active' : '' ?>"> <a href="<?= _url('configure', 'shortcut') ?>"><?= _t('gen.menu.shortcuts') ?></a> diff --git a/app/layout/header.phtml b/app/layout/header.phtml index 3f7bd80e3..7603cf2e5 100644 --- a/app/layout/header.phtml +++ b/app/layout/header.phtml @@ -61,7 +61,7 @@ if (FreshRSS_Auth::accessNeedsAction()) { <li class="item"><a href="<?= _url('configure', 'display') ?>"><?= _t('gen.menu.display') ?></a></li> <li class="item"><a href="<?= _url('configure', 'reading') ?>"><?= _t('gen.menu.reading') ?></a></li> <li class="item"><a href="<?= _url('configure', 'archiving') ?>"><?= _t('gen.menu.archiving') ?></a></li> - <li class="item"><a href="<?= _url('configure', 'sharing') ?>"><?= _t('gen.menu.sharing') ?></a></li> + <li class="item"><a href="<?= _url('configure', 'integration') ?>"><?= _t('gen.menu.sharing') ?></a></li> <li class="item"><a href="<?= _url('configure', 'shortcut') ?>"><?= _t('gen.menu.shortcuts') ?></a></li> <li class="item"><a href="<?= _url('configure', 'queries') ?>"><?= _t('gen.menu.queries') ?></a></li> <li class="item"><a href="<?= _url('user', 'profile') ?>"><?= _t('gen.menu.user_profile') ?></a></li> diff --git a/app/views/configure/sharing.phtml b/app/views/configure/integration.phtml index 32ef11716..32ef11716 100644 --- a/app/views/configure/sharing.phtml +++ b/app/views/configure/integration.phtml |