Fix SpecialUpload::unsaveUploadedFile(). Move UploadVerification hook so that it...

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

diff --git a/includes/SpecialSpecialpages.php b/includes/SpecialSpecialpages.php
index 42b2b6c..bb20235 100644 (file)
--- a/includes/SpecialSpecialpages.php
+++ b/includes/SpecialSpecialpages.php
@@ -1,35 +1,23 @@
 <?php
 /**
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 
 /**
  *
  */
 function wfSpecialSpecialpages() {
-       global $wgLang, $wgOut, $wgUser;
-       
-       $wgOut->setRobotpolicy( "index,nofollow" );
-       $sk = $wgUser->getSkin();       
-       
-       # Get listable pages
-       $pages = SpecialPage::getPages();
-
-       # all users special pages
-       wfSpecialSpecialpages_gen($pages[""],"spheading",$sk);
-
-       # sysops only special pages
-       if ( $wgUser->isSysop() ) {
-               wfSpecialSpecialpages_gen($pages["sysop"],"sysopspheading",$sk);
-       }
+       global $wgOut, $wgUser;
 
-       # developers only special pages
-       if ( $wgUser->isDeveloper() ) {
-               wfSpecialSpecialpages_gen($pages["developer"],"developerspheading",$sk);
+       $wgOut->setRobotpolicy( 'index,nofollow' );
+       $sk = $wgUser->getSkin();
 
-       }
+       /** Pages available to all */
+       wfSpecialSpecialpages_gen( SpecialPage::getRegularPages(), 'spheading', $sk );
+
+       /** Restricted special pages */
+       wfSpecialSpecialpages_gen( SpecialPage::getRestrictedPages(), 'restrictedpheading', $sk );
 }
 
 /**
@@ -39,14 +27,30 @@ function wfSpecialSpecialpages() {
  * @param $sk skin object ???
  */
 function wfSpecialSpecialpages_gen($pages,$heading,$sk) {
-       global $wgLang, $wgOut, $wgAllowSysopQueries;
+       global $wgOut, $wgSortSpecialPages;
+
+       if( count( $pages ) == 0 ) {
+               # Yeah, that was pointless. Thanks for coming.
+               return;
+       }
 
-       $wgOut->addHTML( "<h2>" . wfMsg( $heading ) . "</h2>\n<ul>" );
-       foreach ( $pages as $name => $page ) {
-               if( !$page->isListed() ) {
-                       continue;
+       /** Put them into a sortable array */
+       $sortedPages = array();
+       foreach ( $pages as $page ) {
+               if ( $page->isListed() ) {
+                       $sortedPages[$page->getDescription()] = $page->getTitle();
                }
-               $link = $sk->makeKnownLinkObj( $page->getTitle(), $page->getDescription() );
+       }
+
+       /** Sort */
+       if ( $wgSortSpecialPages ) {
+               ksort( $sortedPages );
+       }
+
+       /** Now output the HTML */
+       $wgOut->addHTML( '<h2>' . wfMsgHtml( $heading ) . "</h2>\n<ul>" );
+       foreach ( $sortedPages as $desc => $title ) {
+               $link = $sk->makeKnownLinkObj( $title , htmlspecialchars( $desc ) );
                $wgOut->addHTML( "<li>{$link}</li>\n" );
        }
        $wgOut->addHTML( "</ul>\n" );