reduce calls of p_get_metadata()

lupo49 · Aug 2, 2013 · c273ff0 · c273ff0
1 parent 47d0693
commit c273ff0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/action.php b/action.php
@@ -33,20 +33,21 @@ public function handle_hidepages(Doku_Event &$event, $param) {
         // skip if page is already marked as hidden or when the admin wants to see all pages
         if($isHidden || $this->getConf('ignorepattern')) return true;
 
-        $metaSearch = (p_get_metadata($pageID, 'hidepage_search') ? true : false);
-        $metaSitemap = (p_get_metadata($pageID, 'hidepage_sitemap') ? true : false);
+        $metaHidden = p_get_metadata($pageID, 'hidepage');
+        $metaHiddenSearch = (isset($metaHidden['search']) ? true : false);
+        $metaHiddenSitemap = (isset($metaHidden['sitemap']) ? true : false);
 
         // check if event is fired by quicksearch or sitemap ajax request
         $isQsearch = ($INPUT->post->str('call') == 'qsearch' ? true : false);
         $isAjaxIndex = ($INPUT->post->str('call') == 'index' ? true : false);
 
         // Hide pages from quicksearch and search result page
-        if(($ACT == 'search' || $isQsearch) && $metaSearch == true) {
+        if(($ACT == 'search' || $isQsearch) && $metaHiddenSearch == true) {
             if($conf['allowdebug']) dbg("hidepages plugin - suppressed page: " . $pageID);
             $event->data['hidden'] = true;
         }
 
-        if(($ACT == 'index' || $isAjaxIndex) && $metaSitemap == true) {
+        if(($ACT == 'index' || $isAjaxIndex) && $metaHiddenSitemap   == true) {
             if($conf['allowdebug']) dbg("hidepages plugin - suppressed page: " . $pageID);
             $event->data['hidden'] = true;
         }

diff --git a/syntax.php b/syntax.php
@@ -55,11 +55,11 @@ function render($mode, &$renderer, $data) {
         if($mode == "metadata") {
             // set flag in metadata to hide page in action component
             if(!is_array($data)) {
-                $renderer->meta['hidepage_sitemap'] = true;
-                $renderer->meta['hidepage_search'] = true;
+                $renderer->meta['hidepage']['sitemap'] = true;
+                $renderer->meta['hidepage']['search'] = true;
             } else {
-                if(in_array('sitemap', $data)) $renderer->meta['hidepage_sitemap'] = true;
-                if(in_array('search', $data))  $renderer->meta['hidepage_search'] = true;
+                if(in_array('sitemap', $data)) $renderer->meta['hidepage']['sitemap'] = true;
+                if(in_array('search', $data))  $renderer->meta['hidepage']['search'] = true;
             }
         }
         return true;