Fix a bug in possible duplicate column naming

diff --git a/docs/NEWS b/docs/NEWS
index 27d73651219693b46acbc9f3158ebd4cbe8a024e..afb7a056d7c19a5ea5936defb49aa4ab63b7e4a7 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,10 @@
 Version 0.9-beta2 ()
 ------------------------------------------------------------------------
 
+    * Fix a bug in the fetchEntry() function which can lead to wrong
+      author/authorid settings when editing an existing entry. Thanks to
+      Martin Eichenberg! (garvinhicking)
+
     * The output of the category plugin can now be styled via Smarty
       templating (plugin_categories.tpl)
 

diff --git a/include/functions_entries.inc.php b/include/functions_entries.inc.php
index 10f2c44d24978a62026b3568473d4ebda515af1b..7897ed3ddfbf9b51b06091025a5ebde9ea3f936f 100644 (file)
--- a/include/functions_entries.inc.php
+++ b/include/functions_entries.inc.php
@@ -342,8 +342,20 @@ function serendipity_fetchEntry($key, $val, $full = true, $fetchDrafts = 'false'
 
     serendipity_plugin_api::hook_event('frontend_fetchentry', $cond, array('noSticky' => true));
 
-    $querystring = "SELECT
-                            *,
+    $querystring = "SELECT  e.id,
+                            e.title,
+                            e.timestamp,
+                            e.body,
+                            e.comments,
+                            e.trackbacks,
+                            e.extended,
+                            e.exflag,
+                            e.authorid,
+                            e.isdraft,
+                            e.allow_comments,
+                            e.last_modified,
+                            e.moderate_comments,
+
                             a.realname AS author,
                             a.email
                       FROM