-$wgEnableEditToolbar, broken in non-English langs, unnecessary

fix typo in update script that caused fatal error

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index dd65fcf..d43214c 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -199,7 +199,4 @@ $wgNamespacesToBeSearchedDefault = array( -1 => 0, 0 => 1, 1 => 0,
 
 # If set, a bold ugly notice will show up at the top of every page.
 $wgSiteNotice = "";
-
-# Javascript toolbar
-$wgEnableEditToolbar = true;
 ?>

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 91ca8b6..86c3c5c 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -83,7 +83,7 @@ class EditPage {
                global $wpSave, $wpPreview;
                global $wpMinoredit, $wpEdittime, $wpTextbox2, $wpSection;
                global $oldid, $redirect, $section;
-               global $wgLang, $wgEnableEditToolbar;
+               global $wgLang;
 
                if(isset($wpSection)) { $section=$wpSection; } else { $wpSection=$section; }
 
@@ -243,7 +243,7 @@ class EditPage {
                $wpSummary = wfEscapeHTML( $wpSummary );
 
 
-               if($wgUser->getOption("showtoolbar") && $wgEnableEditToolbar) {
+               if($wgUser->getOption("showtoolbar")) {
                        // prepare toolbar for edit buttons
                        $toolbar=$sk->getEditToolbar();
                }

diff --git a/languages/Language.php b/languages/Language.php
index 8b68aaf..f53826e 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -117,10 +117,6 @@ this</a> (alternative: like this<a href=\"\" class=\"internal\">?</a>).",
        "nocache" => "Disable page caching"
 );
 
-if (!$wgEnableEditToolbar) {
-       unset($wgUserTogglesEn['showtoolbar']);
-}
-
 /* private */ $wgBookstoreListEn = array(
        "AddALL" => "http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN",
        "PriceSCAN" => "http://www.pricescan.com/books/bookDetail.asp?isbn=$1",

diff --git a/update.php b/update.php
index da1ee70..9dbdafa 100644 (file)
--- a/update.php
+++ b/update.php
@@ -182,7 +182,7 @@ function do_interwiki_update() {
 function do_index_update() {
        # Check that proper indexes are in place
        global $wgDatabase;
-       $meta = $wgDatabase->field_info( "recentchanges", "rc_timestamp" );
+       $meta = $wgDatabase->fieldInfo( "recentchanges", "rc_timestamp" );
        if( $meta->multiple_key == 0 ) {
                echo "Updating indexes to 20031107: ";
                dbsource( "maintenance/archives/patch-indexes.sql" );