[php-blog-cvs] serendipity/include functions_entries.inc.php,1.60,1.61 functions_images.inc.php,1.34,1.35

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26354/include

Modified Files:
	functions_entries.inc.php functions_images.inc.php 
Log Message:
Fix a bit more username stuff. I am seriously afraid there's more borkage left. Please check it out thoroughly, whoever is reading this ;)


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- functions_images.inc.php	17 Feb 2005 17:05:31 -0000	1.34
+++ functions_images.inc.php	25 Feb 2005 14:36:29 -0000	1.35
@@ -25,7 +25,7 @@
         $directorysql = ' WHERE path LIKE \'' . serendipity_db_escape_string($directory) . '%\' ';
     }
 
-    $query = "SELECT i.*, a.username AS authorname FROM {$serendipity['dbPrefix']}images AS i LEFT OUTER JOIN {$serendipity['dbPrefix']}authors AS a ON i.authorid = a.authorid $directorysql ORDER BY $order $ordermode $limitsql";
+    $query = "SELECT i.*, a.realname AS authorname FROM {$serendipity['dbPrefix']}images AS i LEFT OUTER JOIN {$serendipity['dbPrefix']}authors AS a ON i.authorid = a.authorid $directorysql ORDER BY $order $ordermode $limitsql";
     $rs = serendipity_db_query($query, false, 'assoc');
     if (!is_array($rs)) {
         return array();

Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- functions_entries.inc.php	25 Feb 2005 13:30:26 -0000	1.60
+++ functions_entries.inc.php	25 Feb 2005 14:36:29 -0000	1.61
@@ -241,6 +241,7 @@
                     $group
                     ORDER BY {$cond['orderby']}
                     $limit";
+
     $ret = serendipity_db_query($query);
 
     if (is_string($ret)) {
@@ -382,7 +383,8 @@
 
     $querystring = "SELECT
                            c.*,
-                           a.username
+                           a.username,
+                           a.realname
                       FROM {$serendipity['dbPrefix']}category AS c
            LEFT OUTER JOIN {$serendipity['dbPrefix']}authors AS a
                         ON c.authorid = a.authorid $where
@@ -598,7 +600,7 @@
             $entry['link_rdf']               = serendipity_rewriteURL(PATH_FEEDS . '/ei_'. $entry['id'] .'.rdf');
             $entry['link_viewmode_threaded'] = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] .'?url='. $entry['commURL'] .'&serendipity[cview]='. VIEWMODE_THREADED;
             $entry['link_viewmode_linear']   = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] .'?url='. $entry['commURL'] .'&serendipity[cview]='. VIEWMODE_LINEAR;
-            $entry['link_author']          = serendipity_rewriteURL(PATH_AUTHORS .'/'. serendipity_makePermalink(PERM_AUTHORS, array('id' => $entry['authorid'], 'title' => $entry['author'])));
+            $entry['link_author']            = serendipity_rewriteURL(PATH_AUTHORS .'/'. serendipity_makePermalink(PERM_AUTHORS, array('id' => $entry['authorid'], 'title' => $entry['author'])));
 
             if (is_array($entry['categories'])) {
                 foreach ($entry['categories'] as $k => $v) {