Revert namespacebanner feature:

* causes fatal error during database error reporting
* indirect keys won't show up in allmessages; check this for correctness and safety
* no release notes entry for new feature!

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 1f0408f..9349499 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1367,18 +1367,6 @@ function wfGetSiteNotice() {
                        }
                }
        }
-       
-       # Namespacebanner
-       $key = wfMsg('namespacebanner') ;
-       $ns = $wgTitle->getNsText() . '-' ;
-       if ( $ns != "" ) {
-               $key .= str_replace ( '_' , '-' , $ns ) ;
-       }
-       $nsbanner = wfMsg ( $key ) ;
-       if ( $nsbanner != "<".$key.">" ) {
-               $notice .= '<div id="namespacebanner">' . $nsbanner . "</div>" ;
-       }
-       
        wfProfileOut( $fname );
        return $notice;
 }

diff --git a/languages/Language.php b/languages/Language.php
index e2ccf79..04f6d33 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -505,7 +505,6 @@ See $1.',
 'restorelink' => '$1 deleted edits',
 'feedlinks' => 'Feed:',
 'sitenotice'   => '-', # the equivalent to wgSiteNotice
-'namespacebanner'      => 'Namespacebanner',
 
 # Short words for each namespace, by default used in the 'article' tab in monobook
 'nstab-main' => 'Article',