(bug 29116) follow-up r84475: normalise the empty string to null in Block::newFromTar...

diff --git a/includes/Block.php b/includes/Block.php
index df0dfd6..d1e498a 100644 (file)
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -969,6 +969,12 @@ class Block {
         *     not be the same as the target you gave if you used $vagueTarget!
         */
        public static function newFromTarget( $specificTarget, $vagueTarget = null, $fromMaster = false ) {
+               # (bug 29116) passing $vagueTarget = '' is not unreasonable here, but int(0)
+               # is a valid username, so we can't just use weak comparisons.
+               if( $vagueTarget === '' ){
+                       $vagueTarget = null;
+               }
+
                list( $target, $type ) = self::parseTarget( $specificTarget );
                if( $type == Block::TYPE_ID || $type == Block::TYPE_AUTO ){
                        return Block::newFromID( $target );