* (bug 11795) Be more paranoid about confirming accept-encoding header is present

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

diff --git a/includes/SpecialProtectedpages.php b/includes/SpecialProtectedpages.php
index ae3b528..122ca8f 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) ) {
@@ -106,19 +110,28 @@ class ProtectedPagesForm {
                return "<form action=\"$action\" method=\"get\">\n" .
                        '<fieldset>' .
                        Xml::element( 'legend', array(), wfMsg( 'protectedpages' ) ) .
-                       Xml::hidden( 'title', $special ) . "&nbsp\n" .
-                       $this->getNamespaceMenu( $namespace ) . "&nbsp\n" .
-                       $this->getTypeMenu( $type ) . "&nbsp\n" .
+                       Xml::hidden( 'title', $special ) . "&nbsp;\n" .
+                       $this->getNamespaceMenu( $namespace ) . "&nbsp;\n" .
+                       $this->getTypeMenu( $type ) . "&nbsp;\n" .
                        $this->getLevelMenu( $level ) . "<br/>\n" .
                        $this->getSizeLimit( $sizetype, $size ) . "\n" .
-                       "&nbsp" . Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" .
+                       "&nbsp;" . Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" .
                        "</fieldset></form>";
        }
        
-       function getNamespaceMenu( $namespace=NULL ) {
-               return "<label for='namespace'>" . wfMsgHtml('namespace') . "</label>" . HTMLnamespaceselector($namespace, '');
+       /**
+        * Prepare the namespace filter drop-down; standard namespace
+        * selector, sans the MediaWiki namespace
+        *
+        * @param mixed $namespace Pre-select namespace
+        * @return string
+        */
+       function getNamespaceMenu( $namespace = null ) {
+               return Xml::label( wfMsg( 'namespace' ), 'namespace' )
+                       . '&nbsp;'
+                       . Xml::namespaceSelector( $namespace, '' );
        }
-
+       
        /**
         * @return string Formatted HTML
         * @private
@@ -126,9 +139,9 @@ class ProtectedPagesForm {
        function getSizeLimit( $sizetype, $size ) {     
                $out = Xml::radio( 'sizetype', 'min', ($sizetype=='min'), array('id' => 'wpmin') );
                $out .= Xml::label( wfMsg("minimum-size"), 'wpmin' );
-               $out .= "&nbsp".Xml::radio( 'sizetype', 'max', ($sizetype=='max'), array('id' => 'wpmax') );
+               $out .= "&nbsp;".Xml::radio( 'sizetype', 'max', ($sizetype=='max'), array('id' => 'wpmax') );
                $out .= Xml::label( wfMsg("maximum-size"), 'wpmax' );
-               $out .= "&nbsp".Xml::input('size', 9, $size, array( 'id' => 'wpsize' ) );
+               $out .= "&nbsp;".Xml::input('size', 9, $size, array( 'id' => 'wpsize' ) );
                $out .= ' '.wfMsgHtml('pagesize');
                return $out;
        }
@@ -219,8 +232,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();
@@ -229,7 +241,6 @@ class ProtectedPagesPager extends AlphabeticPager {
        }
        
        function formatRow( $row ) {
-               $block = new Block;
                return $this->mForm->formatRow( $row );
        }
 
@@ -251,7 +262,7 @@ class ProtectedPagesPager extends AlphabeticPager {
                        $conds[] = 'page_namespace=' . $this->mDb->addQuotes( $this->namespace );
                return array(
                        'tables' => array( 'page_restrictions', 'page' ),
-                       'fields' => 'pr_id,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
                );
        }
@@ -266,11 +277,10 @@ class ProtectedPagesPager extends AlphabeticPager {
  */
 function wfSpecialProtectedpages() {
 
-       list( $limit, $offset ) = wfCheckLimits();
-
        $ppForm = new ProtectedPagesForm();
 
        $ppForm->showList();
 }
 
-?>
+
+