diff options
| -rw-r--r-- | app/Models/View.php | 2 | ||||
| -rw-r--r-- | app/layout/layout.phtml | 2 | ||||
| -rw-r--r-- | app/layout/simple.phtml | 4 | ||||
| -rw-r--r-- | lib/Minz/ActionException.php | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/app/Models/View.php b/app/Models/View.php index 944bfbea1..a46ebd95e 100644 --- a/app/Models/View.php +++ b/app/Models/View.php @@ -23,6 +23,8 @@ class FreshRSS_View extends Minz_View { /** @var int */ public $nbUnreadTags; public $tags; + /** @var array<string,string> */ + public $notification; // Substriptions public $default_category; diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml index f1a84e134..7e3ffd34a 100644 --- a/app/layout/layout.phtml +++ b/app/layout/layout.phtml @@ -66,7 +66,7 @@ if (_t('gen.dir') === 'rtl') { <?php $msg = ''; $status = 'closed'; - if (isset($this->notification)) { + if (!empty($this->notification)) { $msg = $this->notification['content']; $status = $this->notification['type']; diff --git a/app/layout/simple.phtml b/app/layout/simple.phtml index b4d3530bc..cd17273cd 100644 --- a/app/layout/simple.phtml +++ b/app/layout/simple.phtml @@ -46,7 +46,6 @@ <?php if (FreshRSS_Auth::accessNeedsAction()) { ?> <a class="signout" href="<?= _url('auth', 'logout') ?>"> <?= _i('logout') . _t('gen.auth.logout') ?> - (<?= htmlspecialchars(Minz_Session::param('currentUser', '_'), ENT_NOQUOTES, 'UTF-8') ?>) </a> <?php } ?> @@ -59,10 +58,9 @@ <?php $msg = ''; $status = 'closed'; - if (isset($this->notification)) { + if (!empty($this->notification)) { $msg = $this->notification['content']; $status = $this->notification['type']; - invalidateHttpCache(); } ?> diff --git a/lib/Minz/ActionException.php b/lib/Minz/ActionException.php index 82f250958..53f0aab04 100644 --- a/lib/Minz/ActionException.php +++ b/lib/Minz/ActionException.php @@ -4,7 +4,7 @@ class Minz_ActionException extends Minz_Exception { // Just for security, as we are not supposed to get non-alphanumeric characters. $action_name = rawurlencode($action_name); - $message = "Invalid action name “${action_name}” for controller “${controller_name}”."; + $message = "Invalid action name “{$action_name}” for controller “{$controller_name}”."; parent::__construct ($message, $code); } } |