| Index: trunk/phase3/includes/filerepo/file/File.php |
| — | — | @@ -35,7 +35,7 @@ |
| 36 | 36 | const RENDER_NOW = 1; |
| 37 | 37 | /** |
| 38 | 38 | * Force rendering even if thumbnail already exist and using RENDER_NOW |
| 39 | | - * I.e. you have to pass both flags: File::RENDER_NOW | File::RENDER_FORCE |
| | 39 | + * I.e. you have to pass both flags: File::RENDER_NOW | File::RENDER_FORCE |
| 40 | 40 | */ |
| 41 | 41 | const RENDER_FORCE = 2; |
| 42 | 42 | |
| — | — | @@ -99,7 +99,7 @@ |
| 100 | 100 | |
| 101 | 101 | /** |
| 102 | 102 | * Call this constructor from child classes. |
| 103 | | - * |
| | 103 | + * |
| 104 | 104 | * Both $title and $repo are optional, though some functions |
| 105 | 105 | * may return false or throw exceptions if they are not set. |
| 106 | 106 | * Most subclasses will want to call assertRepoDefined() here. |
| — | — | @@ -335,7 +335,7 @@ |
| 336 | 336 | * Get an FS copy or original of this file and return the path. |
| 337 | 337 | * Returns false on failure. Callers must not alter the file. |
| 338 | 338 | * Temporary files are cleared automatically. |
| 339 | | - * |
| | 339 | + * |
| 340 | 340 | * @return string|false |
| 341 | 341 | */ |
| 342 | 342 | public function getLocalRefPath() { |
| — | — | @@ -775,7 +775,7 @@ |
| 776 | 776 | return $this->handler->getTransform( $this, $thumbPath, $thumbUrl, $params ); |
| 777 | 777 | } |
| 778 | 778 | } elseif ( $flags & self::RENDER_FORCE ) { |
| 779 | | - wfDebug( __METHOD__ . " forcing rendering per flag File::RENDER_FORCE\n" ); |
| | 779 | + wfDebug( __METHOD__ . " forcing rendering per flag File::RENDER_FORCE\n" ); |
| 780 | 780 | } |
| 781 | 781 | |
| 782 | 782 | // Create a temp FS file with the same extension |
| Index: trunk/phase3/includes/media/Bitmap.php |
| — | — | @@ -45,9 +45,9 @@ |
| 46 | 46 | wfRunHooks( 'BitmapHandlerCheckImageArea', array( $image, &$params, &$checkImageAreaHookResult ) ); |
| 47 | 47 | if ( is_null( $checkImageAreaHookResult ) ) { |
| 48 | 48 | global $wgMaxImageArea; |
| 49 | | - |
| | 49 | + |
| 50 | 50 | if ( $srcWidth * $srcHeight > $wgMaxImageArea && |
| 51 | | - !( $image->getMimeType() == 'image/jpeg' && |
| | 51 | + !( $image->getMimeType() == 'image/jpeg' && |
| 52 | 52 | self::getScalerType( false, false ) == 'im' ) ) { |
| 53 | 53 | # Only ImageMagick can efficiently downsize jpg images without loading |
| 54 | 54 | # the entire file in memory |
| — | — | @@ -56,7 +56,7 @@ |
| 57 | 57 | } else { |
| 58 | 58 | return $checkImageAreaHookResult; |
| 59 | 59 | } |
| 60 | | - |
| | 60 | + |
| 61 | 61 | return true; |
| 62 | 62 | } |
| 63 | 63 | |
| — | — | @@ -89,10 +89,10 @@ |
| 90 | 90 | /** |
| 91 | 91 | * Function that returns the number of pixels to be thumbnailed. |
| 92 | 92 | * Intended for animated GIFs to multiply by the number of frames. |
| 93 | | - * |
| | 93 | + * |
| 94 | 94 | * @param File $image |
| 95 | 95 | * @return int |
| 96 | | - */ |
| | 96 | + */ |
| 97 | 97 | function getImageArea( $image ) { |
| 98 | 98 | return $image->getWidth() * $image->getHeight(); |
| 99 | 99 | } |
| — | — | @@ -132,7 +132,7 @@ |
| 133 | 133 | |
| 134 | 134 | # Determine scaler type |
| 135 | 135 | $scaler = self::getScalerType( $dstPath ); |
| 136 | | - |
| | 136 | + |
| 137 | 137 | wfDebug( __METHOD__ . ": creating {$scalerParams['physicalDimensions']} thumbnail at $dstPath using scaler $scaler\n" ); |
| 138 | 138 | |
| 139 | 139 | if ( !$image->mustRender() && |
| Index: trunk/phase3/includes/media/ExifBitmap.php |
| — | — | @@ -34,8 +34,8 @@ |
| 35 | 35 | |
| 36 | 36 | // Treat Software as a special case because in can contain |
| 37 | 37 | // an array of (SoftwareName, Version). |
| 38 | | - if (isset( $metadata['Software'] ) |
| 39 | | - && is_array( $metadata['Software'] ) |
| | 38 | + if (isset( $metadata['Software'] ) |
| | 39 | + && is_array( $metadata['Software'] ) |
| 40 | 40 | && is_array( $metadata['Software'][0]) |
| 41 | 41 | && isset( $metadata['Software'][0][0] ) |
| 42 | 42 | && isset( $metadata['Software'][0][1]) |
| — | — | @@ -136,7 +136,7 @@ |
| 137 | 137 | function getImageSize( $image, $path ) { |
| 138 | 138 | global $wgEnableAutoRotation; |
| 139 | 139 | $gis = parent::getImageSize( $image, $path ); |
| 140 | | - |
| | 140 | + |
| 141 | 141 | // Don't just call $image->getMetadata(); FSFile::getPropsFromPath() calls us with a bogus object. |
| 142 | 142 | // This may mean we read EXIF data twice on initial upload. |
| 143 | 143 | if ( $wgEnableAutoRotation ) { |
| — | — | @@ -171,7 +171,7 @@ |
| 172 | 172 | if ( !$wgEnableAutoRotation ) { |
| 173 | 173 | return 0; |
| 174 | 174 | } |
| 175 | | - |
| | 175 | + |
| 176 | 176 | $data = $file->getMetadata(); |
| 177 | 177 | return $this->getRotationForExif( $data ); |
| 178 | 178 | } |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -2490,13 +2490,13 @@ |
| 2491 | 2491 | $wgBetterDirectionality = true; |
| 2492 | 2492 | |
| 2493 | 2493 | /** |
| 2494 | | - * Some web hosts attempt to rewrite all responses with a 404 (not found) |
| | 2494 | + * Some web hosts attempt to rewrite all responses with a 404 (not found) |
| 2495 | 2495 | * status code, mangling or hiding MediaWiki's output. If you are using such a |
| 2496 | | - * host, you should start looking for a better one. While you're doing that, |
| | 2496 | + * host, you should start looking for a better one. While you're doing that, |
| 2497 | 2497 | * set this to false to convert some of MediaWiki's 404 responses to 200 so |
| 2498 | 2498 | * that the generated error pages can be seen. |
| 2499 | 2499 | * |
| 2500 | | - * In cases where for technical reasons it is more important for MediaWiki to |
| | 2500 | + * In cases where for technical reasons it is more important for MediaWiki to |
| 2501 | 2501 | * send the correct status code than for the body to be transmitted intact, |
| 2502 | 2502 | * this configuration variable is ignored. |
| 2503 | 2503 | */ |
| Index: trunk/phase3/languages/messages/MessagesQqq.php |
| — | — | @@ -1947,7 +1947,7 @@ |
| 1948 | 1948 | 'http-invalid-scheme' => 'The message appears in the Mediawiki code as follows: |
| 1949 | 1949 | |
| 1950 | 1950 | if ( $this->parsedUrl[\'scheme\'] != \'http\' ) { |
| 1951 | | - $this->status->fatal( \'http-invalid-scheme\', $this->parsedUrl[\'scheme\'] ); |
| | 1951 | + $this->status->fatal( \'http-invalid-scheme\', $this->parsedUrl[\'scheme\'] ); |
| 1952 | 1952 | } |
| 1953 | 1953 | |
| 1954 | 1954 | Siebrand think this has to do with allowing MediaWiki to fetch remote URLs, and in that not allowing anything but "http://" request. So if this for example is "irc://" or "https://", $1 would be "irc" or "https" respectively. |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -4662,7 +4662,7 @@ |
| 4663 | 4663 | 'newuserlog-byemail' => 'password sent by e-mail', |
| 4664 | 4664 | |
| 4665 | 4665 | # Feedback |
| 4666 | | -'feedback-bugornote' => 'If you are ready to describe a technical problem in detail please [$1 report a bug]. |
| | 4666 | +'feedback-bugornote' => 'If you are ready to describe a technical problem in detail please [$1 report a bug]. |
| 4667 | 4667 | Otherwise, you can use the easy form below. Your comment will be added to the page "[$3 $2]", along with your username and what browser you are using.', |
| 4668 | 4668 | 'feedback-subject' => 'Subject:', |
| 4669 | 4669 | 'feedback-message' => 'Message:', |