Changeset 3600 for trunk/comments.php

Timestamp:

Jul 16, 2009, 7:20:34 AM (15 years ago)

Author:

rvelices

Message:

• fix php warning from comment_list.tpl
• author name is saved always in #comments (even for registered users) so that
  • sql queries are simpler on the comments page (one less table in a big join)
  • when a user is deleted, we can keep the username in the #comments (there might be still a bug that author_id is not updated when a user is deleted)

File:

• trunk/comments.php (modified) (6 diffs)

trunk/comments.php

@@ -88 +88 @@
   $page['items_number'] = $_GET['items_number'];
 }
-if ( !is_numeric($page['items_number']) and $page['items_number']!='all' ) 
+if ( !is_numeric($page['items_number']) and $page['items_number']!='all' )
 {
   $page['items_number'] = 10;
@@ -272 +272 @@
     INNER JOIN '.COMMENTS_TABLE.' AS com
     ON ic.image_id = com.image_id
-    LEFT JOIN '.USERS_TABLE.' As u
-    ON u.'.$conf['user_fields']['id'].' = com.author_id
   WHERE '.implode('
     AND ', $page['where_clauses']).'
@@ -305 +303 @@
      , com.author
      , com.author_id
-     , '.$conf['user_fields']['username'].' AS username
      , com.date
      , com.content
@@ -312 +309 @@
     INNER JOIN '.COMMENTS_TABLE.' AS com
     ON ic.image_id = com.image_id
-    LEFT JOIN '.USERS_TABLE.' AS u
-    ON u.'.$conf['user_fields']['id'].' = com.author_id
   WHERE '.implode('
     AND ', $page['where_clauses']).'
@@ -379 +374 @@
           );
 
-    if (!empty($comment['author']))
-    {
-      $author = $comment['author'];
-      if ($author == 'guest')
-      {
-        $author = l10n('guest');
-      }
-    }
-    else
-    {
-      $author = $comment['username'];
-    }
-
     $tpl_comment =
       array(
@@ -397 +379 @@
         'TN_SRC' => $thumbnail_src,
         'ALT' => $name,
-        'AUTHOR' => trigger_event('render_comment_author', $author),
+        'AUTHOR' => trigger_event('render_comment_author', $comment['author']),
         'DATE'=>format_date($comment['date'], true),
         'CONTENT'=>trigger_event('render_comment_content',$comment['content']),