It helps when you don't break things...

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

diff --git a/includes/SpecialProtectedpages.php b/includes/SpecialProtectedpages.php
index ba60054..7b98211 100644 (file)
--- a/includes/SpecialProtectedpages.php
+++ b/includes/SpecialProtectedpages.php
@@ -70,6 +70,10 @@ class ProtectedPagesForm {
 
                $description_items[] = $protType;
 
+               if ( $row->pr_cascade ) {
+                       $description_items[] = wfMsg( 'protect-summary-cascade' );
+               }
+
                $expiry_description = ''; $stxt = '';
 
                if ( $row->pr_expiry != 'infinity' && strlen($row->pr_expiry) ) {
@@ -219,8 +223,7 @@ class ProtectedPagesPager extends AlphabeticPager {
                $lb = new LinkBatch;
 
                while ( $row = $this->mResult->fetchObject() ) {
-                       $name = str_replace( ' ', '_', $row->page_title );
-                       $lb->add( $row->page_namespace, $name );
+                       $lb->add( $row->page_namespace, $row->page_title );
                }
 
                $lb->execute();
@@ -239,10 +242,11 @@ class ProtectedPagesPager extends AlphabeticPager {
                $conds[] = 'page_id=pr_page';
                $conds[] = 'pr_type=' . $this->mDb->addQuotes( $this->type );
                
-               if( $this->sizetype=='min' )
+               if( $this->sizetype=='min' ) {
                        $conds[] = 'page_len>=' . $this->size;
-               else if( $this->sizetype=='max' )
+               } else if( $this->sizetype=='max' ) {
                        $conds[] = 'page_len<=' . $this->size;
+               }
                
                if( $this->level )
                        $conds[] = 'pr_level=' . $this->mDb->addQuotes( $this->level );
@@ -250,9 +254,8 @@ class ProtectedPagesPager extends AlphabeticPager {
                        $conds[] = 'page_namespace=' . $this->mDb->addQuotes( $this->namespace );
                return array(
                        'tables' => array( 'page_restrictions', 'page' ),
-                       'fields' => 'max(pr_id) AS pr_id,page_namespace,page_title,page_len,pr_type,pr_level,pr_expiry',
-                       'conds' => $conds,
-                       'options' => array( 'GROUP BY' => 'page_namespace,page_title,page_len,pr_type,pr_level,pr_expiry' ),
+                       'fields' => 'pr_id,page_namespace,page_title,page_len,pr_type,pr_level,pr_expiry,pr_cascade',
+                       'conds' => $conds
                );
        }
 
@@ -273,4 +276,5 @@ function wfSpecialProtectedpages() {
        $ppForm->showList();
 }
 
-?>
+
+