Bump version from rc.0 to rc.2

[lhc/web/wiklou.git] / includes / Category.php

diff --git a/includes/Category.php b/includes/Category.php
index 629962d..6104b8a 100644 (file)
--- a/includes/Category.php
+++ b/includes/Category.php
@@ -119,9 +119,9 @@ class Category {
        /**
         * Factory function.
         *
-        * @param array $name A category name (no "Category:" prefix).  It need
+        * @param string $name A category name (no "Category:" prefix).  It need
         *   not be normalized, with spaces replaced by underscores.
-        * @return mixed Category, or false on a totally invalid name
+        * @return Category|bool Category, or false on a totally invalid name
         */
        public static function newFromName( $name ) {
                $cat = new self();
@@ -328,7 +328,7 @@ class Category {
                $dbw = wfGetDB( DB_MASTER );
                # Avoid excess contention on the same category (T162121)
                $name = __METHOD__ . ':' . md5( $this->mName );
-               $scopedLock = $dbw->getScopedLockAndFlush( $name, __METHOD__, 1 );
+               $scopedLock = $dbw->getScopedLockAndFlush( $name, __METHOD__, 0 );
                if ( !$scopedLock ) {
                        return false;
                }