split prefs-help-userdata to prefs-help-realname & prefs-help-email. Nds still need...

[lhc/web/wiklou.git] / maintenance / InitialiseMessages.inc

diff --git a/maintenance/InitialiseMessages.inc b/maintenance/InitialiseMessages.inc
index 9815770..3976d18 100755 (executable)
--- a/maintenance/InitialiseMessages.inc
+++ b/maintenance/InitialiseMessages.inc
@@ -10,7 +10,7 @@
  * @subpackage Maintenance
  */
 
-
+/** */
 function initialiseMessages( $overwrite = false, $messageArray = false ) {
        global $wgContLang, $wgContLanguageCode;
        global $wgContLangClass, $wgAllMessagesEn;
@@ -69,16 +69,9 @@ function initialiseMessages( $overwrite = false, $messageArray = false ) {
                        }
                }
        }
-
        initialiseMessagesReal( $overwrite, $messages );
 }
 
-
-
-
-
-
-
 /** */
 function initialiseMessagesReal( $overwrite = false, $messageArray = false ) {
        global $wgContLang, $wgScript, $wgServer, $wgAllMessagesEn;
@@ -113,7 +106,6 @@ function initialiseMessagesReal( $overwrite = false, $messageArray = false ) {
        $revision = $dbr->tableName( 'revision' );
 
        $timestamp = wfTimestampNow();
-       $invTimestamp = wfInvertTimestamp( $timestamp );
 
        #$sql = "SELECT cur_title,cur_is_new,cur_user_text FROM $cur WHERE cur_namespace=$ns AND cur_title IN(";
        $sql = "SELECT page_title,page_is_new,rev_user_text FROM $page, $revision WHERE
@@ -152,7 +144,7 @@ function initialiseMessagesReal( $overwrite = false, $messageArray = false ) {
        # Decide whether or not each one needs to be overwritten
        $existingTitles = array();
        while ( $row ) {
-               if ( $row->rev_user_text != $username ) {
+               if ( $row->rev_user_text != $username  && $row->rev_user_text != 'Template namespace initialisation script' ) {
                        $existingTitles[$row->page_title] = 'keep';
                } else {
                        $existingTitles[$row->page_title] = 'chuck';
@@ -178,36 +170,33 @@ function initialiseMessagesReal( $overwrite = false, $messageArray = false ) {
                } else {
                        $message = wfMsgNoDBForContent( $key );
                }
-               $titleObj = Title::newFromText( $wgContLang->ucfirst( $key ) );
+               $titleObj = Title::newFromText( $wgContLang->ucfirst( $key ), NS_MEDIAWIKI );
                $title = $titleObj->getDBkey();
 
                # Update messages which already exist
                if ( array_key_exists( $title, $existingTitles ) ) {
                        if ( $existingTitles[$title] == 'chuck' || $overwrite) {
-                               # print "$title\n";
-                               $mwTitleObj = Title::makeTitle( NS_MEDIAWIKI, $title );
-                               $article = new Article( $mwTitleObj );
-                               $article->quickEdit( $message );
+                               # Don't bother writing a new revision if we're the same
+                               # as the current text!
+                               $revision = Revision::newFromTitle( $titleObj );
+                               if( is_null( $revision ) || $revision->getText() != $message ) {
+                                       $article = new Article( $titleObj );
+                                       $article->quickEdit( $message );
+                               }
                        }
                } else {
-                       extract( $dbw->tableNames( 'text', 'page', 'revision' ) );
-                       $sql = "INSERT INTO $text (old_text, old_flags) VALUES ('" .
-                               wfStrencode( $message ) .
-                               "', '')";
-                       $dbw->query( $sql, $fname );
-                       $text_id = $dbw->insertID();
-
-                       $sql = "INSERT INTO $page (page_namespace, page_title, page_restrictions, page_counter, page_is_redirect,
-                               page_is_new, page_random, page_touched, page_latest) VALUES (
-                               {$ns}, '{$title}', 'sysop', 0, 0, 1, 0.5, '{$timestamp}', {$text_id} )";
-                       $dbw->query( $sql, $fname );
-                       $page_id = $dbw->insertID();
-
-                       $sql = "INSERT INTO $revision (rev_id, rev_page, rev_comment, rev_user, rev_user_text,
-                                                       rev_timestamp, inverse_timestamp, rev_minor_edit)
-                                       VALUES ({$text_id}, {$page_id}, '', 0, '{$username}', '{$timestamp}', '{$invTimestamp}', 0)";
-                       $dbw->query( $sql, $fname );
-
+                       $article = new Article( $titleObj );
+                       $newid = $article->insertOn( $dbw, 'sysop' );
+                       # FIXME: set restrictions
+                       $revision = new Revision( array(
+                               'page'      => $newid,
+                               'text'      => $message,
+                               'user'      => 0,
+                               'user_text' => $username,
+                               'comment'   => '',
+                               ) );
+                       $revid = $revision->insertOn( $dbw );
+                       $article->updateRevisionOn( $dbw, $revision );
                }
        }
 
@@ -217,8 +206,8 @@ function initialiseMessagesReal( $overwrite = false, $messageArray = false ) {
        print "Done.\n";
 }
 
-function loadLanguageFile( $filename )
-{
+/** */
+function loadLanguageFile( $filename ) {
        $contents = file_get_contents( $filename );
        # Remove header line
        $p = strpos( $contents, "\n" ) + 1;
@@ -227,9 +216,9 @@ function loadLanguageFile( $filename )
        return unserialize( $contents );
 }
 
+/** */
 function doUpdates() {
        global $wgDeferredUpdateList;
        foreach ( $wgDeferredUpdateList as $up ) { $up->doUpdate(); }
 }
-
 ?>