diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2022-11-15 15:42:26 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-11-15 15:42:26 +0100 |
| commit | 42eeb402ad574236902e40d35d630fa15d29a985 (patch) | |
| tree | 4eeaedaabcb8ef94b11170f76d55916969b2fe9f /app/layout/aside_configure.phtml | |
| parent | 07c94061a9607b5d0a1341cc1b349ee094d5115b (diff) | |
Fix type hints regressions (#4855)
Fix regressions from https://github.com/FreshRSS/FreshRSS/pull/4561
Example:
```
PHP Fatal error: Uncaught TypeError: Argument 1 passed to checkToken() must be an instance of FreshRSS_UserConfiguration, instance of Minz_Configuration given, called in /var/www/FreshRSS/p/api/greader.php on line 1091 and defined in /var/www/FreshRSS/p/api/greader.php:223
Stack trace:
#0 /var/www/FreshRSS/p/api/greader.php(1091): checkToken()
#1 {main}
thrown in /var/www/FreshRSS/p/api/greader.php on line 223
```
Improvement of https://github.com/FreshRSS/FreshRSS/pull/4110
Diffstat (limited to 'app/layout/aside_configure.phtml')
| -rw-r--r-- | app/layout/aside_configure.phtml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml index 5f1762834..f4a05a47c 100644 --- a/app/layout/aside_configure.phtml +++ b/app/layout/aside_configure.phtml @@ -1,8 +1,8 @@ <nav class="nav nav-list aside" id="aside_feed"> <a class="toggle_aside" href="#close"><?= _i('close') ?></a> - + <ul> - <li class="nav-header"><?= _t('gen.menu.account') ?>: <?= htmlspecialchars(Minz_Session::param('currentUser', '_'), ENT_NOQUOTES, 'UTF-8')?></li> + <li class="nav-header"><?= _t('gen.menu.account') ?>: <?= htmlspecialchars(Minz_Session::param('currentUser', '_'), ENT_NOQUOTES, 'UTF-8')?></li> <li class="item<?= Minz_Request::controllerName() === 'user' && Minz_Request::actionName() === 'profile' ? ' active' : '' ?>"> <a href="<?= _url('user', 'profile') ?>"><?= _t('gen.menu.user_profile') ?></a> </li> @@ -54,7 +54,7 @@ <li class="item<?= Minz_Request::controllerName() === 'update' && Minz_Request::actionName() === 'checkInstall' ? ' active' : '' ?>"> <a href="<?= _url('update', 'checkInstall') ?>"><?= _t('gen.menu.check_install') ?></a> </li> - <?php if (!Minz_Configuration::get('system')->disable_update) { ?> + <?php if (!FreshRSS_Context::$system_conf->disable_update) { ?> <li class="item<?= Minz_Request::controllerName() === 'update' && Minz_Request::actionName() === 'index' ? ' active' : '' ?>"> <a href="<?= _url('update', 'index') ?>"><?= _t('gen.menu.update') ?></a> </li> |