Fix regression caused by r62087 which failed to insert rows into the image table...

Also correct indefinite/infinite/infinity protection.

diff --git a/includes/Article.php b/includes/Article.php
index e02ca66..300c256 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -2607,7 +2607,7 @@ class Article {
                                $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 != '' ) {

diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index 20597eb..4712325 100644 (file)
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -186,7 +186,7 @@ if ( isset( $options['protect'] ) && $options['protect'] == 1 )
                                }
 
                                if ( !$commentText ) {
-                                       $commentText = $comment;
+                                       $commentText = $comment ? $comment : 'Importing image file';
                                }
                        }