eat a couple more namespace cruft bits

diff --git a/includes/Namespace.php b/includes/Namespace.php
index 360f7e6..f0992a7 100644 (file)
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -51,18 +51,6 @@ if( defined( 'MEDIAWIKI' ) && is_array( $wgExtraNamespaces ) ) {
  */
 class Namespace {
 
-       /**#@+
-        * These functions are deprecated
-        * @deprecated
-        */
-       function getSpecial() { return NS_SPECIAL; }
-       function getUser() { return NS_USER; }
-       function getWikipedia() { return NS_PROJECT; }
-       function getImage() { return NS_IMAGE; }
-       function getMedia() { return NS_MEDIA; }
-       function getCategory() { return NS_CATEGORY; }
-       /**#@-*/
-
        /**
         * Check if the given namespace might be moved
         * @return bool

diff --git a/index.php b/index.php
index 26bacbf..0df5541 100644 (file)
--- a/index.php
+++ b/index.php
@@ -84,12 +84,12 @@ if( !$wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
        /* redirect to canonical url, make it a 301 to allow caching */
        $wgOut->setSquidMaxage( 1200 );
        $wgOut->redirect( $wgTitle->getFullURL(), '301');
-} else if ( Namespace::getSpecial() == $wgTitle->getNamespace() ) {
+} else if ( NS_SPECIAL == $wgTitle->getNamespace() ) {
        # actions that need to be made when we have a special pages
        require_once( 'includes/SpecialPage.php' );
        SpecialPage::executePath( $wgTitle );
 } else {
-       if ( Namespace::getMedia() == $wgTitle->getNamespace() ) {
+       if ( NS_MEDIA == $wgTitle->getNamespace() ) {
                $wgTitle = Title::makeTitle( NS_IMAGE, $wgTitle->getDBkey() );
        }