Changeset 1509 in ExiteCMS for branches/PLi-Fusion/forum/viewforum.php

Timestamp:

07/02/08 18:27:06 (4 years ago)

Author:

hverton

Message:

Merged trunk revisions 1408:1508 into the PLi-Fusion branch

File:

• branches/PLi-Fusion/forum/viewforum.php (modified) (7 diffs)

branches/PLi-Fusion/forum/viewforum.php

@@ -38 +38 @@
 if (file_exists(PATH_MODULES."advertising/get_ad.php")) {
     require_once PATH_MODULES."advertising/get_ad.php";
-    $variables['advert'] = get_ad(array(1,2));
+    $variables['ad1'] = get_ad(array(1,2,5));
+    $variables['ad1'] = get_ad(array(4,5));
 } else {
-    $variables['advert'] = "";
+    $variables['ad1'] = "";
+    $variables['ad2'] = "";
 }
 
@@ -50 +52 @@
     "SELECT f.*, f2.forum_name AS forum_cat_name, f2.forum_id as forum_cat_id
     FROM ".$db_prefix."forums f
-    LEFT JOIN ".$db_prefix."forums f2 ON f.forum_cat=f2.forum_id
+    INNER JOIN ".$db_prefix."forums f2 ON f.forum_cat=f2.forum_id
     WHERE f.forum_id='".$forum_id."'"
 );
@@ -90 +92 @@
         SELECT p.thread_id
             FROM ".$db_prefix."posts p
-            LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id
+            INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id
             WHERE tr.user_id = '".$userdata['user_id']."'
                 AND tr.forum_id = '".$forum_id."'
@@ -110 +112 @@
             SELECT count(*) as unread 
                 FROM ".$db_prefix."posts p 
-                    LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 
+                    INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 
                 WHERE tr.user_id = '".$userdata['user_id']."' 
                     AND tr.forum_id = '".$forum_id."'
@@ -121 +123 @@
             SELECT count(*) as unread 
                 FROM ".$db_prefix."posts p 
-                    LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 
+                    INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 
                 WHERE tr.user_id = '".$userdata['user_id']."' 
                     AND tr.forum_id = '".$forum_id."'
@@ -148 +150 @@
     "SELECT t.*, MAX(p.post_id) AS last_post, COUNT(p.post_id) AS thread_replies, tu1.user_name AS user_author, tu1.user_ip AS user_ip, 
             tu2.user_name AS user_lastuser, tu1.user_cc_code AS user_cc_code FROM ".$db_prefix."threads t
-        LEFT JOIN ".$db_prefix."posts p USING ( thread_id )
-        LEFT JOIN ".$db_prefix."users tu1 ON t.thread_author = tu1.user_id
-        LEFT JOIN ".$db_prefix."users tu2 ON t.thread_lastuser = tu2.user_id
+        INNER JOIN ".$db_prefix."posts p USING ( thread_id )
+        INNER JOIN ".$db_prefix."users tu1 ON t.thread_author = tu1.user_id
+        INNER JOIN ".$db_prefix."users tu2 ON t.thread_lastuser = tu2.user_id
         WHERE t.forum_id = '".$forum_id."'
         GROUP BY thread_id
@@ -173 +175 @@
             SELECT count(*) as unread, MIN(p.post_id) as post_id
                 FROM ".$db_prefix."posts p 
-                LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 
+                INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 
                 WHERE tr.user_id = '".$userdata['user_id']."' 
                     AND tr.thread_id = '".$data['thread_id']."'