Merge pull request #5238 from annando/more-abstraction

Even more replaced item calls ...

diff --git a/include/text.php b/include/text.php
index 16c0b41814f09daca9a521d3fa52c6e3279818a7..10f626458665c7beb19e2d23d970f924387e7857 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -984,7 +984,7 @@ function search($s, $id = 'search-box', $url = 'search', $save = false, $aside =
                        '$action_url' => $url,
                        '$search_label' => L10n::t('Search'),
                        '$save_label' => $save_label,
-                       '$savedsearch' => Feature::isEnabled(local_user(),'savedsearch'),
+                       '$savedsearch' => local_user() && Feature::isEnabled(local_user(),'savedsearch'),
                        '$search_hint' => L10n::t('@name, !forum, #tags, content'),
                        '$mode' => $mode
                ];

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 4f5756caf99aba834962e0d14d5dc6b23a237edd..9d2b77d1f1a2796436792f48c88afa964ee66317 100644 (file)
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -346,7 +346,12 @@ function frio_display_item(App $a, &$arr)
 {
        // Add subthread to the item menu
        $subthread = [];
-       if (local_user() == $arr['item']['uid'] && $arr['item']['parent'] == $arr['item']['id'] && !$arr['item']['self']) {
+       if (
+               local_user()
+               && local_user() == $arr['item']['uid']
+               && $arr['item']['parent'] == $arr['item']['id']
+               && !$arr['item']['self'])
+       {
                $subthread = [
                        'menu'   => 'follow_thread',
                        'title'  => L10n::t('Follow Thread'),