* Fix missing %username% permalink pattern in single entry view.

      Patch by cress_cc

diff --git a/docs/NEWS b/docs/NEWS
index da8f7b3d271761731dd88d743cb5472f88dcdc7f..32539efa0060ea281842612bb3a6b1ab819faef2 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 1.2 ()
 ------------------------------------------------------------------------
 
+    * Fix missing %username% permalink pattern in single entry view.
+      Patch by cress_cc
+
     * Allow to specify non-default port when using MySQLi
       (garvinhicking)
 

diff --git a/include/functions_entries.inc.php b/include/functions_entries.inc.php
index 2c0a41755c0c7629c76113e33c2db28c996518f4..8394dba86540f6ca64a352a06b1f63dfc41ce7db 100644 (file)
--- a/include/functions_entries.inc.php
+++ b/include/functions_entries.inc.php
@@ -510,6 +510,7 @@ function &serendipity_fetchEntry($key, $val, $full = true, $fetchDrafts = 'false
                             e.moderate_comments,
 
                             a.realname AS author,
+                            a.username AS loginname,
                             a.email
                       FROM
                             {$serendipity['dbPrefix']}entries e
@@ -644,6 +645,7 @@ function &serendipity_fetchCategories($authorid = null, $name = null, $order = n
                            c.parentid,
 
                            a.username,
+                           a.username AS loginname,
                            a.realname
                       FROM {$serendipity['dbPrefix']}category AS c
            LEFT OUTER JOIN {$serendipity['dbPrefix']}authors AS a