diff --git a/pages/genericPage.class.php b/pages/genericPage.class.php index ea26a60c..efd7a035 100644 --- a/pages/genericPage.class.php +++ b/pages/genericPage.class.php @@ -579,7 +579,7 @@ class GenericPage } // get announcements and notes for user - private function addAnnouncements() : void + private function addAnnouncements(bool $pagespecific = true) : void { if (!isset($this->announcements)) $this->announcements = []; @@ -603,7 +603,7 @@ class GenericPage // fetch announcements if ($this->pageTemplate['pageName']) { - $ann = DB::Aowow()->Select('SELECT ABS(id) AS ARRAY_KEY, a.* FROM ?_announcements a WHERE status = 1 AND (page = ? OR page = "*") AND (groupMask = 0 OR groupMask & ?d)', $this->pageTemplate['pageName'], User::$groups); + $ann = DB::Aowow()->Select('SELECT ABS(id) AS ARRAY_KEY, a.* FROM ?_announcements a WHERE status = 1 AND (page = ? OR page = "*") AND (groupMask = 0 OR groupMask & ?d)', $pagespecific ? $this->pageTemplate['pageName'] : '', User::$groups); foreach ($ann as $k => $v) { if ($t = Util::localizedString($v, 'text')) @@ -744,7 +744,7 @@ class GenericPage if ($override) { - $this->addAnnouncements(); + $this->addAnnouncements(false); include('template/pages/'.$override.'.tpl.php'); die(); diff --git a/pages/profiles.php b/pages/profiles.php index 5e09e039..e5924272 100644 --- a/pages/profiles.php +++ b/pages/profiles.php @@ -30,6 +30,8 @@ class ProfilesPage extends GenericPage { $this->getSubjectFromUrl($pageParam); + parent::__construct($pageCall, $pageParam); + if (!CFG_PROFILER_ENABLE) $this->error(); @@ -48,8 +50,6 @@ class ProfilesPage extends GenericPage $this->filterObj = new ProfileListFilter(false, ['realms' => $realms]); - parent::__construct($pageCall, $pageParam); - $this->name = Util::ucFirst(Lang::game('profiles')); $this->subCat = $pageParam ? '='.$pageParam : ''; }