DataObjects/Cms_page_category.php

diff --git a/DataObjects/Cms_page_category.php b/DataObjects/Cms_page_category.php
index d4ce419..aff8a1c 100644 (file)
--- a/DataObjects/Cms_page_category.php
+++ b/DataObjects/Cms_page_category.php
@@ -34,7 +34,7 @@ class Pman_Cms_DataObjects_Cms_page_category  extends DB_DataObject
         $core_enum->orderBy('seqid ASC');
         $ce = clone($core_enum);
         $base = $core_enum->fetchAll('id','name');
-        $display_name = $ce->fetchAll('id','display_name');
+        $display_names = $ce->fetchAll('id','display_name');
         
         $type_to_name = array_flip($base);
         
@@ -82,25 +82,25 @@ class Pman_Cms_DataObjects_Cms_page_category  extends DB_DataObject
         
         $categories = array();
         
-        foreach ($base as $b){
-            if($b->name == 'page'){
+        foreach ($display_names as $id=>$name){
+            if($base[$id] == 'page'){
                 $categories = array_merge($categories, $sub['page']);
                 $categories[] = array(
-                    'pid' => $b->id,
-                    'name' => $b->name,
-                    'display_name' => "{$b->display_name} (All)",
+                    'pid' => $id,
+                    'name' => $base['name'],
+                    'display_name' => "{$name} (All)",
                     'type' => 'page_type'
                 );
                 
                 continue;
             }
             
-            if($b->name == 'blog'){
+            if($base[$id] == 'blog'){
                 $categories = array_merge($categories, $sub['blog']);
                 $categories[] = array(
-                    'pid' => $b->id,
-                    'name' => $b->name,
-                    'display_name' => "{$b->display_name} (All)",
+                    'pid' => $id,
+                    'name' => $base[$id],
+                    'display_name' => "{$name} (All)",
                     'type' => 'page_type'
                 );
                 
@@ -108,9 +108,9 @@ class Pman_Cms_DataObjects_Cms_page_category  extends DB_DataObject
             }
             
             $categories[] = array(
-                'pid' => $b->id,
-                'name' => $b->name,
-                'display_name' => "{$b->display_name}",
+                'pid' => $id,
+                'name' => $base[$id],
+                'display_name' => $name,
                 'type' => 'page_type'
             );
         }