Merge "Allow int as return type of MediaHandler::isMetadataValid"

diff --git a/includes/media/MediaHandler.php b/includes/media/MediaHandler.php
index 1a96c1d..7dd0491 100644 (file)
--- a/includes/media/MediaHandler.php
+++ b/includes/media/MediaHandler.php
@@ -193,7 +193,7 @@ abstract class MediaHandler {
         *  performance problems.
         * @param File $image
         * @param string $metadata The metadata in serialized form
-        * @return bool
+        * @return bool|int
         */
        public function isMetadataValid( $image, $metadata ) {
                return self::METADATA_GOOD;

diff --git a/includes/media/XCFHandler.php b/includes/media/XCFHandler.php
index e47cc37..e2cc1b2 100644 (file)
--- a/includes/media/XCFHandler.php
+++ b/includes/media/XCFHandler.php
@@ -186,7 +186,7 @@ class XCFHandler extends BitmapHandler {
         *
         * @param File $file The file object for the file in question
         * @param string $metadata Serialized metadata
-        * @return bool One of the self::METADATA_(BAD|GOOD|COMPATIBLE) constants
+        * @return bool|int One of the self::METADATA_(BAD|GOOD|COMPATIBLE) constants
         */
        public function isMetadataValid( $file, $metadata ) {
                if ( !$metadata ) {