[Cpan-forum-commit] rev 346 - in trunk: . lib/CPAN/Forum

[svn at pti.co.il]

Author: gabor
Date: 2007-08-14 11:35:21 +0300 (Tue, 14 Aug 2007)
New Revision: 346

Modified:
   trunk/
   trunk/lib/CPAN/Forum/DBI.pm
Log:
show the group name as well after using pmypager



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 7bc34947-122d-0410-bc5a-f898d2bb5f81:/local/cpan-forum:4432
8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/cpan-forum:12752
   + 7bc34947-122d-0410-bc5a-f898d2bb5f81:/local/cpan-forum:4433
8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/cpan-forum:12752

Modified: trunk/lib/CPAN/Forum/DBI.pm
===================================================================
--- trunk/lib/CPAN/Forum/DBI.pm	2007-08-14 08:35:08 UTC (rev 345)
+++ trunk/lib/CPAN/Forum/DBI.pm	2007-08-14 08:35:21 UTC (rev 346)
@@ -262,7 +262,7 @@
     my ($where, @values) = $self->_prep_where($args{where});
     $CPAN::Forum::logger->debug("where='$where'");
 
-    my $fetch_sql = "SELECT posts.id, subject, thread, date, username FROM posts, users";
+    my $fetch_sql = "SELECT posts.id, subject, thread, date, username, groups.name group_name FROM posts, users, groups";
     my $count_sql = "SELECT COUNT(*) FROM posts";
     my @fetch_values = @values;
 
@@ -276,7 +276,7 @@
     } else {
         $fetch_sql = " WHERE ";
     }
-    $fetch_sql .= " users.id=posts.uid";
+    $fetch_sql .= " users.id=posts.uid AND groups.id=posts.gid";
 
     my $order_by = $args{order_by};
     $order_by =~ s/^\s*id/posts.id/;