http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73587
Revision: 73587
Author: overlordq
Date: 2010-09-23 02:59:07 +0000 (Thu, 23 Sep 2010)
Log Message:
-----------
Fix regression caused by r62087 which failed to insert rows into the image
table due to null comment.
Also correct indefinite/infinite/infinity protection.
Modified Paths:
--------------
trunk/phase3/includes/Article.php
trunk/phase3/maintenance/importImages.php
Modified: trunk/phase3/includes/Article.php
===================================================================
--- trunk/phase3/includes/Article.php 2010-09-23 02:48:58 UTC (rev 73586)
+++ trunk/phase3/includes/Article.php 2010-09-23 02:59:07 UTC (rev 73587)
@@ -2607,7 +2607,7 @@
$protect_description = '';
foreach ( $limit as $action => $restrictions ) {
if ( !isset( $expiry[$action] ) )
- $expiry[$action] = 'infinite';
+ $expiry[$action] =
Block::infinity();
$encodedExpiry[$action] =
Block::encodeExpiry( $expiry[$action], $dbw );
if ( $restrictions != '' ) {
Modified: trunk/phase3/maintenance/importImages.php
===================================================================
--- trunk/phase3/maintenance/importImages.php 2010-09-23 02:48:58 UTC (rev
73586)
+++ trunk/phase3/maintenance/importImages.php 2010-09-23 02:59:07 UTC (rev
73587)
@@ -186,7 +186,7 @@
}
if ( !$commentText ) {
- $commentText = $comment;
+ $commentText = $comment ? $comment :
'Importing image file';
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
