Userlevels and grouplevels have been moved out to a 'steward' group. Make

[lhc/web/wiklou.git] / includes / CategoryPage.php

diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index 6160b4d..2922b71 100644 (file)
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -91,8 +91,8 @@ class CategoryPage extends Article {
                        array( 'page_title', 'page_namespace', 'cl_sortkey' ),
                        array( $pageCondition,
                               'cl_from          =  page_id',
-                              'cl_to'           => $this->mTitle->getDBKey(),
-                              'page_is_redirect' => 0),
+                              'cl_to'           => $this->mTitle->getDBKey()),
+                              #'page_is_redirect' => 0),
                        #+ $pageCondition,
                        $fname,
                        array( 'ORDER BY' => $flip ? 'cl_sortkey DESC' : 'cl_sortkey',
@@ -233,8 +233,8 @@ class CategoryPage extends Article {
                        $chunkIndex < 3;
                        $chunkIndex++, $startChunk = $endChunk, $endChunk += $chunk + 1)
                {
-
-                       $r .= '<td><ul>';
+                       $r .= "<td>\n";
+                       $atColumnTop = true;
 
                        // output all articles in category
                        for ($index = $startChunk ;
@@ -246,16 +246,24 @@ class CategoryPage extends Article {
                                         ($articles_start_char[$index] != $articles_start_char[$index - 1]) )
 
                                {
+                                       if( $atColumnTop ) {
+                                               $atColumnTop = false;
+                                       } else {
+                                               $r .= "</ul>\n";
+                                       }
                                        $cont_msg = "";
                                        if ( $articles_start_char[$index] == $prev_start_char )
                                                $cont_msg = wfMsg('listingcontinuesabbrev');
-                                       $r .= "</ul><h3>{$articles_start_char[$index]}$cont_msg</h3>\n<ul>";
+                                       $r .= "<h3>{$articles_start_char[$index]}$cont_msg</h3>\n<ul>";
                                        $prev_start_char = $articles_start_char[$index];
                                }
 
                                $r .= "<li>{$articles[$index]}</li>";
                        }
-                       $r .= '</ul></td>';
+                       if( !$atColumnTop ) {
+                               $r .= "</ul>\n";
+                       }
+                       $r .= "</td>\n";
 
 
                }