fixed quickEdit(), used quickEdit() in InitialiseMessages.inc

diff --git a/includes/Article.php b/includes/Article.php
index 3285d72..1eff42b 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1530,7 +1530,7 @@ class Article {
                wfProfileIn( $fname );
 
                $ns = $this->mTitle->getNamespace();
-               $dbkey = $this->mTitle->getDBkey;
+               $dbkey = $this->mTitle->getDBkey();
                $encDbKey = wfStrencode( $dbkey );
                $timestamp = wfTimestampNow();
                
@@ -1559,10 +1559,13 @@ class Article {
                if ( $numRows ) {
                        # Update article
                        $fields['cur_is_new'] = 0;
-                       wfUpdateArray( $fields, array( 'cur_namespace' => $ns, 'cur_title' => $dbkey ), $fname );
+                       wfUpdateArray( "cur", $fields, array( 'cur_namespace' => $ns, 'cur_title' => $dbkey ), $fname );
                } else {
                        # Insert new article
                        $fields['cur_is_new'] = 1;
+                       $fields['cur_namespace'] = $ns;
+                       $fields['cur_title'] = $dbkey;
+                       $fields['cur_random'] = $rand = number_format( mt_rand() / mt_getrandmax(), 12, ".", "" );
                        wfInsertArray( "cur", $fields, $fname );
                }
                wfProfileOut( $fname );

diff --git a/maintenance/InitialiseMessages.inc b/maintenance/InitialiseMessages.inc
index 500ed9d..c681bc8 100755 (executable)
--- a/maintenance/InitialiseMessages.inc
+++ b/maintenance/InitialiseMessages.inc
@@ -14,9 +14,7 @@ function initialiseMessages( $overwrite = false, $messageArray = false ) {
 
        $wgUser = new User;
        $wgUser->setLoaded( true ); # Don't load from DB
-       $wgUser->setName( "Template namespace initialisation script" );
-       $wgUser->addRight( "bot" );
-       $wgUser = User::newFromName( 'MediaWiki default' );
+       $wgUser->setName( "MediaWiki default" );
        
        # Don't try to draw messages from the database we're initialising
        $wgMessageCache->disable();
@@ -113,17 +111,9 @@ function initialiseMessages( $overwrite = false, $messageArray = false ) {
                if ( array_key_exists( $title, $existingTitles ) ) {
                        if ( $existingTitles[$title] == "chuck" || $overwrite) {
                                print "$title\n";
-                               # Save old current version
-                               $sql = "insert into old (old_namespace,old_title,old_text,old_comment,old_user,old_user_text,old_timestamp)
-                                 select cur_namespace,cur_title,cur_text,cur_comment,cur_user,cur_user_text,cur_timestamp 
-                                 from cur where cur_namespace=8 and cur_title='$title'";
-                               wfQuery( $sql, DB_WRITE );
-                               # Update text
-                               $sql = "update cur set cur_text='$dbencMsg',cur_timestamp='$timestamp',cur_user=0,
-                                 cur_user_text='$username', inverse_timestamp=$invTimestamp, cur_comment='',
-                                 cur_is_new=0,cur_is_redirect=0,cur_minor_edit=0, cur_touched='$timestamp' 
-                                 WHERE cur_namespace=8 and cur_title='$title'";
-                               wfQuery( $sql, DB_WRITE );
+                               $mwTitleObj = Title::makeTitle( NS_MEDIAWIKI, $title );
+                               $article = new Article( $mwTitleObj );
+                               $article->quickSave( $message );
                        }
                        $doInsert = false;
                } else {