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

      Patch by cress_cc

diff --git a/docs/NEWS b/docs/NEWS
index 30163d504474793895359c5512ba91e931fa3c45..c8a4a9dc90a50f9848be9c838ae933fdb75449aa 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -1,5 +1,11 @@
 # $Id$
 
+Version 1.1.3 ()
+------------------------------------------------------------------------
+
+    * Fix missing %username% permalink pattern in single entry view.
+      Patch by cress_cc
+          
 Version 1.1.2 ()
 ------------------------------------------------------------------------
 

diff --git a/include/functions_entries.inc.php b/include/functions_entries.inc.php
index 2d663a237c6d061832d3208534b14592408f8834..8dfba88e8f8ac65b80f29a676cac0f37665a4a56 100644 (file)
--- a/include/functions_entries.inc.php
+++ b/include/functions_entries.inc.php
@@ -502,6 +502,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
@@ -635,6 +636,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

diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index 23eb0db20451d8ed11fbe4ef2b010959f8bb9892..68c789fd72ad7d5d1eff3be1fdbff0ecad3ab225 100644 (file)
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -31,7 +31,7 @@ if (!defined('IN_serendipity')) {
 include(S9Y_INCLUDE_PATH . 'include/compat.inc.php');
 
 // The version string
-$serendipity['version']         = '1.1.2';
+$serendipity['version']         = '1.1.3';
 
 // Setting this to 'false' will enable debugging output. All alpa/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'.
 $serendipity['production']      = (preg_match('@\-(alpha|beta|cvs)@', $serendipity['version']) ? false : true);