| Index: trunk/phase3/maintenance/storage/compressOld.inc |
| — | — | @@ -15,7 +15,7 @@ |
| 16 | 16 | print "Starting from old_id $start...\n"; |
| 17 | 17 | $dbw = wfGetDB( DB_MASTER ); |
| 18 | 18 | do { |
| 19 | | - $res = $dbw->select( 'text', array( 'old_id','old_flags','old_namespace','old_title','old_text' ), |
| | 19 | + $res = $dbw->select( 'text', array( 'old_id','old_flags','old_text' ), |
| 20 | 20 | "old_id>=$start", $fname, array( 'ORDER BY' => 'old_id', 'LIMIT' => $chunksize, 'FOR UPDATE' ) ); |
| 21 | 21 | if( $dbw->numRows( $res ) == 0 ) { |
| 22 | 22 | break; |
| Index: trunk/phase3/includes/ProtectionForm.php |
| — | — | @@ -341,6 +341,9 @@ |
| 342 | 342 | return '<tr>' |
| 343 | 343 | . '<td><label for="expires">' . wfMsgExt( 'protectexpiry', array( 'parseinline' ) ) . '</label></td>' |
| 344 | 344 | . '<td>' . Xml::input( 'mwProtect-expiry', 60, $this->mExpiry, $attribs ) . '</td>' |
| | 345 | + . '</tr><tr>' |
| | 346 | + . '<td><label for="expires">' . wfMsgExt( 'protectexpiry', array( 'parseinline' ) ) . '</label></td>' |
| | 347 | + . '<td>' . Xml::input( 'mwProtect-expiry', 60, $this->mExpiry, $attribs ) . '</td>' |
| 345 | 348 | . '</tr>'; |
| 346 | 349 | } |
| 347 | 350 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -335,8 +335,8 @@ |
| 336 | 336 | * (bug 12327) Comma in username no longer disrupts mail headers |
| 337 | 337 | * (bug 6436) Localization of Special:Import XML parser Error message(s). |
| 338 | 338 | * Security fix for API on MSIE |
| | 339 | +* (bug 12768) Database query syntax error in maintenance/storage/compressOld.inc |
| 339 | 340 | |
| 340 | | - |
| 341 | 341 | == Parser changes in 1.12 == |
| 342 | 342 | |
| 343 | 343 | The parser pass order has changed from |