Backport: Show category description on mouse over

diff --git a/docs/NEWS b/docs/NEWS
index 521e99132d375946197002c52a95e1725c9d020a..94919fa974fbf4e69f0024ace5a0f1ff7010ca82 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -14,6 +14,9 @@ Version 0.8.3 ()
        XML_RPC         to 1.3.3
      Fixing several bugs and vulnerabilities. (nohn)
 
+   * Make categories sidebar plugin show categories' description, not the
+     name on mouse over (garvinhicking)
+        
    * Fix possible exploit that sends comments to the blog owner and others
      with arbitrary mailheaders and a link to invalid entries. Thanks to
      Sebastian Raible! (garvinhicking)

diff --git a/include/plugin_internal.inc.php b/include/plugin_internal.inc.php
index 2c4ca7ca9e0bb8de726d01a41bd28afd82f132ef..afd2f508bf292a3ee0d4544667f683501402f5b7 100644 (file)
--- a/include/plugin_internal.inc.php
+++ b/include/plugin_internal.inc.php
@@ -991,7 +991,7 @@ class serendipity_categories_plugin extends serendipity_plugin {
                 if ( !empty($image) ) {
                     $html .= '<a href="'. serendipity_rewriteURL(PATH_FEEDS .'/'. PATH_CATEGORIES .'/'. serendipity_makePermalink(PERM_FEEDS_CATEGORIES, array('id' => $cat['categoryid'], 'title' => $cat['category_name']))) .'"><img src="'. $image .'" alt="XML" style="border: 0px" /></a> ';
                 }
-                $html .= '<a href="'. serendipity_rewriteURL(PATH_CATEGORIES . '/' . serendipity_makePermalink(PERM_CATEGORIES, array('id' => $cat['categoryid'], 'title' => $cat['category_name'])), 'serendipityHTTPPath') .'" title="'. $cat['category_name'] .'" style="padding-left: '. $cat['depth']*6 .'px">'. $cat['category_name'] .'</a>';
+                $html .= '<a href="'. serendipity_rewriteURL(PATH_CATEGORIES . '/' . serendipity_makePermalink(PERM_CATEGORIES, array('id' => $cat['categoryid'], 'title' => $cat['category_name'])), 'serendipityHTTPPath') .'" title="'. htmlspecialchars($cat['category_description']) .'" style="padding-left: '. $cat['depth']*6 .'px">'. htmlspecialchars($cat['category_name']) .'</a>';
                 $html .= '</div>' . "\n";
             }
         }