Changeset 5539

Timestamp:

03/05/08 21:02:26 (7 months ago)

Author:

inureyes

Message:

#863

• 카테고리 출력시에도 숫자를 사용하도록 수정
  

Location:

trunk

Files:

• interface/blog/category.php (modified) (1 diff)
• lib/view/view.php (modified) (3 diffs)

trunk/interface/blog/category.php

@@ -9 +9 @@
 
 $cache = new pageCache;
-$category = empty($suri['value']) ? 0 : getCategoryIdByLabel($blogid, $suri['value']);
-
+if(!isset($suri['id'])) {
+    $category = empty($suri['value']) ? 0 : getCategoryIdByLabel($blogid, $suri['value']);
+} else {
+    $category = $suri['id'];
+    $suri['value'] = getCategoryLabelById($blogid, $category);
+}
 if(!doesHaveOwnership() && getCategoryVisibility($blogid, $category) < 2)
     $category = null;

trunk/lib/view/view.php

@@ -405 +405 @@
 
 function getCategoriesView($totalPosts, $categories, $selected, $xhtml = false) {
-    global $blogURL, $service;
+    global $blogURL, $service, $blog;
     requireModel('blog.category');
     requireLibrary('blog.skin');
@@ -418 +418 @@
             foreach ($category1['children'] as $category2) {
                 if( doesHaveOwnership() || getCategoryVisibility($blogid, $category2['id']) > 1) {
-                    array_push($children, array('id' => $category2['id'], 'label' => $category2['name'], 'value' => (doesHaveOwnership() ? $category2['entriesInLogin'] : $category2['entries']), 'link' => "$blogURL/category/" . URL::encode($category2['label'],$service['useEncodedURL']), 'children' => array()));
+                    array_push($children, 
+                        array('id' => $category2['id'], 
+                            'label' => $category2['name'], 
+                            'value' => (doesHaveOwnership() ? $category2['entriesInLogin'] : $category2['entries']), 
+                            'link' => "$blogURL/category/" . ($blog['useSlogan'] ? URL::encode($category2['label'],$service['useEncodedURL']) : $category2['id']), 
+                            'children' => array()
+                        )
+                    );
                     $categoryCount = $categoryCount + (doesHaveOwnership() ? $category2['entriesInLogin'] : $category2['entries']);
                 }
@@ -425 +432 @@
             $parentCategoryCount = (doesHaveOwnership() ? $category1['entriesInLogin'] - $categoryCountAll : $category1['entries'] - $categoryCountAll);
             if($category1['id'] != 0) {
-                array_push($tree['children'], array('id' => $category1['id'], 'label' => $category1['name'], 'value' => $categoryCount + $parentCategoryCount, 'link' => "$blogURL/category/" . URL::encode($category1['label'],$service['useEncodedURL']), 'children' => $children));
+                array_push($tree['children'], 
+                    array('id' => $category1['id'], 
+                        'label' => $category1['name'], 
+                        'value' => $categoryCount + $parentCategoryCount, 
+                        'link' => "$blogURL/category/" . ($blog['useSlogan'] ? URL::encode($category1['label'],$service['useEncodedURL']) : $category1['id']), 
+                        'children' => $children)
+                );
             }
             $categoryCount = 0;