From: Huji <huji@users.mediawiki.org>
Date: Thu, 24 Jan 2008 11:21:36 +0000 (+0000)
Subject: (bug 12738) Database query syntax error in maintenance/storage/compressOld.inc
X-Git-Tag: 1.31.0-rc.0~49805
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=615041d7b4122c22dbf322bd9d46f445703c3969;p=lhc%2Fweb%2Fwiklou.git

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

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 '<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 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;