From 615041d7b4122c22dbf322bd9d46f445703c3969 Mon Sep 17 00:00:00 2001 From: Huji Date: Thu, 24 Jan 2008 11:21:36 +0000 Subject: [PATCH] (bug 12738) Database query syntax error in maintenance/storage/compressOld.inc --- RELEASE-NOTES | 2 +- includes/ProtectionForm.php | 3 +++ maintenance/storage/compressOld.inc | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 2e3865380b..a20975de9e 100644 --- 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 950a46319c..9964ddfdb7 100644 --- a/includes/ProtectionForm.php +++ b/includes/ProtectionForm.php @@ -339,6 +339,9 @@ class ProtectionForm { function buildExpiryInput() { $attribs = array( 'id' => 'expires' ) + $this->disabledAttrib; return '' + . '' + . '' . Xml::input( 'mwProtect-expiry', 60, $this->mExpiry, $attribs ) . '' + . '' . '' . '' . Xml::input( 'mwProtect-expiry', 60, $this->mExpiry, $attribs ) . '' . ''; diff --git a/maintenance/storage/compressOld.inc b/maintenance/storage/compressOld.inc index 2da015b00e..421f53048c 100644 --- 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; -- 2.20.1