| Index: trunk/phase3/maintenance/importImages.php |
| — | — | @@ -186,7 +186,7 @@ |
| 187 | 187 | } |
| 188 | 188 | |
| 189 | 189 | if ( !$commentText ) { |
| 190 | | - $commentText = $comment; |
| | 190 | + $commentText = $comment ? $comment : 'Importing image file'; |
| 191 | 191 | } |
| 192 | 192 | } |
| 193 | 193 | |
| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -2607,7 +2607,7 @@ |
| 2608 | 2608 | $protect_description = ''; |
| 2609 | 2609 | foreach ( $limit as $action => $restrictions ) { |
| 2610 | 2610 | if ( !isset( $expiry[$action] ) ) |
| 2611 | | - $expiry[$action] = 'infinite'; |
| | 2611 | + $expiry[$action] = Block::infinity(); |
| 2612 | 2612 | |
| 2613 | 2613 | $encodedExpiry[$action] = Block::encodeExpiry( $expiry[$action], $dbw ); |
| 2614 | 2614 | if ( $restrictions != '' ) { |