(bug 12738) Database query syntax error in maintenance/storage/compressOld.inc

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2e38653..a20975d 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -335,7 +335,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 12327) Comma in username no longer disrupts mail headers
 * (bug 6436) Localization of Special:Import XML parser Error message(s).
 * Security fix for API on MSIE
-
+* (bug 12768) Database query syntax error in maintenance/storage/compressOld.inc
 
 == Parser changes in 1.12 ==
 

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index 950a463..9964ddf 100644 (file)
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -339,6 +339,9 @@ class ProtectionForm {
        function buildExpiryInput() {
                $attribs = array( 'id' => 'expires' ) + $this->disabledAttrib;
                return '<tr>'
+                       . '<td><label for="expires">' . wfMsgExt( 'protectexpiry', array( 'parseinline' ) ) . '</label></td>'
+                       . '<td>' . Xml::input( 'mwProtect-expiry', 60, $this->mExpiry, $attribs ) . '</td>'
+                       . '</tr><tr>'
                        . '<td><label for="expires">' . wfMsgExt( 'protectexpiry', array( 'parseinline' ) ) . '</label></td>'
                        . '<td>' . Xml::input( 'mwProtect-expiry', 60, $this->mExpiry, $attribs ) . '</td>'
                        . '</tr>';

diff --git a/maintenance/storage/compressOld.inc b/maintenance/storage/compressOld.inc
index 2da015b..421f530 100644 (file)
--- a/maintenance/storage/compressOld.inc
+++ b/maintenance/storage/compressOld.inc
@@ -15,7 +15,7 @@ function compressOldPages( $start = 0, $extdb = '' ) {
        print "Starting from old_id $start...\n";
        $dbw = wfGetDB( DB_MASTER );
        do {
-               $res = $dbw->select( 'text', array( 'old_id','old_flags','old_namespace','old_title','old_text' ),
+               $res = $dbw->select( 'text', array( 'old_id','old_flags','old_text' ),
                        "old_id>=$start", $fname, array( 'ORDER BY' => 'old_id', 'LIMIT' => $chunksize, 'FOR UPDATE' ) );
                if( $dbw->numRows( $res ) == 0 ) {
                        break;