cleanID() prior to acl checks

glensc · Apr 7, 2010 · 1148b0f · 1148b0f
1 parent e5a4d2c
commit 1148b0f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/action.php b/action.php
@@ -111,6 +111,7 @@ function _cache_prepare(&$event, $param) {
             $include_key = '@ALL';
         }
 
+
         $depends = p_get_metadata($ID, 'plugin_include');
         if(is_array($depends)) {
             $pages = array();
@@ -129,7 +130,7 @@ function _cache_prepare(&$event, $param) {
 
         $key = ''; 
         foreach($pages as $page) {
-            $page = $this->helper->_apply_macro($page);
+            $page = cleanID($this->helper->_apply_macro($page));
             $file = wikiFN($page);
             if(!in_array($cache->depends['files'], array($file)) && @file_exists($file)) {
                 $cache->depends['files'][] = $file;

diff --git a/helper.php b/helper.php
@@ -213,7 +213,7 @@ function parse_instructions($id, &$ins) {
                 }
 
                 if($mode == 'page' || $mode == 'section') {
-                    $page  = $ins[$i][1][1][1];
+                    $page = cleanID($ins[$i][1][1][1]);
                     $perm = auth_quickaclcheck($page);
 
                     array_push($this->hasparts, $page);