Merge "Array to string conversion in TransformationalImageHandler.php:167"

diff --git a/docs/hooks.txt b/docs/hooks.txt
index d5fb2af..f4b8ef2 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -2594,6 +2594,10 @@ database result.
 &$titleArray: set this to an object to override the default object returned
 $res: database result used to create the object
 
+'TitleExists': Called when determining whether a page exists at a given title.
+$title: The title being tested.
+&$exists: Whether the title exists.
+
 'TitleQuickPermissions': Called from Title::checkQuickPermissions to add to
 or override the quick permissions check.
 $title: The Title object being accessed

diff --git a/includes/Title.php b/includes/Title.php
index 8727b74..74d78ba 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -4333,7 +4333,9 @@ class Title {
         * @return bool
         */
        public function exists() {
-               return $this->getArticleID() != 0;
+               $exists = $this->getArticleID() != 0;
+               wfRunHooks( 'TitleExists', array( $this, &$exists ) );
+               return $exists;
        }
 
        /**

diff --git a/includes/media/TransformationalImageHandler.php b/includes/media/TransformationalImageHandler.php
index 671f0c5..3e3be3d 100644 (file)
--- a/includes/media/TransformationalImageHandler.php
+++ b/includes/media/TransformationalImageHandler.php
@@ -577,7 +577,7 @@ abstract class TransformationalImageHandler extends ImageHandler {
         */
        public function rotate( $file, $params ) {
                return new MediaTransformError( 'thumbnail_error', 0, 0,
-                       "$scaler rotation not implemented" );
+                       get_class( $this ) . ' rotation not implemented' );
        }
 
        /**