Merge "Make getScopedLockAndFlush() in Category::refreshCounts non-blocking" into...

diff --git a/includes/Category.php b/includes/Category.php
index 9241730..6104b8a 100644 (file)
--- a/includes/Category.php
+++ b/includes/Category.php
@@ -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;
                }