From 41751a3625ec635ce0fc4c16793947c6ed6fdab6 Mon Sep 17 00:00:00 2001
From: joyqi <magike.net@gmail.com>
Date: Wed, 9 Aug 2017 14:10:41 +0800
Subject: [PATCH] fix #597

---
 var/Widget/Abstract/Contents.php   |  7 +++++--
 var/Widget/Metas/Category/List.php | 22 +++++++++++++++++++++-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/var/Widget/Abstract/Contents.php b/var/Widget/Abstract/Contents.php
index 9f8dc1f0..164408db 100644
--- a/var/Widget/Abstract/Contents.php
+++ b/var/Widget/Abstract/Contents.php
@@ -646,7 +646,7 @@ class Widget_Abstract_Contents extends Widget_Abstract
         if (!empty($value['categories'])) {
             $value['category'] = $value['categories'][0]['slug'];
 
-            $value['directory'] = $this->widget('Widget_Metas_Category_List')->getAllParents($value['categories'][0]['mid']);
+            $value['directory'] = $this->widget('Widget_Metas_Category_List')->getAllParentsSlug($value['categories'][0]['mid']);
             $value['directory'][] = $value['category'];
         }
 
@@ -899,7 +899,10 @@ class Widget_Abstract_Contents extends Widget_Abstract
      */
     public function directory($split = '/', $link = true, $default = NULL)
     {
-        $directory = $this->directory;
+        $category = $this->categories[0];
+        $directory = $this->widget('Widget_Metas_Category_List')->getAllParents($category['mid']);
+        $directory[] = $category;
+
         if ($directory) {
             $result = array();
 
diff --git a/var/Widget/Metas/Category/List.php b/var/Widget/Metas/Category/List.php
index 0161d4b3..670f29bb 100644
--- a/var/Widget/Metas/Category/List.php
+++ b/var/Widget/Metas/Category/List.php
@@ -323,7 +323,7 @@ class Widget_Metas_Category_List extends Widget_Abstract_Metas
      */
     public function filter(array $value)
     {
-        $value['directory'] = $this->getAllParents($value['mid']);
+        $value['directory'] = $this->getAllParentsSlug($value['mid']);
         $value['directory'][] = $value['slug'];
 
         $tmpCategoryTree = $value['directory'];
@@ -358,6 +358,26 @@ class Widget_Metas_Category_List extends Widget_Abstract_Metas
     {
         $parents = array();
         
+        if (isset($this->_parents[$mid])) {
+            foreach ($this->_parents[$mid] as $parent) {
+                $parents[] = $this->_map[$parent];
+            }
+        }
+
+        return $parents;
+    }
+
+    /**
+     * 获取某个分类所有父级节点缩略名
+     * 
+     * @param mixed $mid 
+     * @access public
+     * @return array
+     */
+    public function getAllParentsSlug($mid)
+    {
+        $parents = array();
+        
         if (isset($this->_parents[$mid])) {
             foreach ($this->_parents[$mid] as $parent) {
                 $parents[] = $this->_map[$parent]['slug'];