X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FTitle.php;h=9d8614df44eadcc8d344b2998a705ad91f93753a;hb=5cb425a62b6eba0161702fe49568d137d7b91c91;hp=ea4a1b2fb6c6d3b95ddba681849a52f8c3b7ea59;hpb=65282b39c7c6328e3fc329c65b2c1ba80a5746ca;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Title.php b/includes/Title.php
index ea4a1b2fb6..9d8614df44 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2723,11 +2723,14 @@ class Title {
 	 * Cascading protection: Get the source of any cascading restrictions on this page.
 	 *
 	 * @param bool $getPages Whether or not to retrieve the actual pages
-	 *        that the restrictions have come from.
-	 * @return array|bool Array of Title objects of the pages from which cascading restrictions
-	 *     have come, false for none, or true if such restrictions exist, but $getPages
-	 *     was not set.  The restriction array is an array of each type, each of which
-	 *     contains a array of unique groups.
+	 *        that the restrictions have come from and the actual restrictions
+	 *        themselves.
+	 * @return array Two elements: First is an array of Title objects of the
+	 *        pages from which cascading restrictions have come, false for
+	 *        none, or true if such restrictions exist but $getPages was not
+	 *        set. Second is an array like that returned by
+	 *        Title::getAllRestrictions(), or an empty array if $getPages is
+	 *        false.
 	 */
 	public function getCascadeProtectionSources( $getPages = true ) {
 		global $wgContLang;
@@ -2834,7 +2837,8 @@ class Title {
 	 * Accessor/initialisation for mRestrictions
 	 *
 	 * @param string $action Action that permission needs to be checked for
-	 * @return array Array of Strings the array of groups allowed to edit this article
+	 * @return array Restriction levels needed to take the action. All levels
+	 *     are required.
 	 */
 	public function getRestrictions( $action ) {
 		if ( !$this->mRestrictionsLoaded ) {
@@ -2848,9 +2852,8 @@ class Title {
 	/**
 	 * Accessor/initialisation for mRestrictions
 	 *
-	 * @return array Array of Arrays of Strings the first level indexed by
-	 * action, the second level containing the names of the groups
-	 * allowed to perform each action
+	 * @return array Keys are actions, values are arrays as returned by
+	 *     Title::getRestrictions()
 	 * @since 1.23
 	 */
 	public function getAllRestrictions() {
@@ -4728,6 +4731,10 @@ class Title {
 			return false;
 		}
 
+		if ( $this->mArticleID === 0 ) {
+			return true; // avoid gap locking if we know it's not there
+		}
+
 		$method = __METHOD__;
 		$dbw = wfGetDB( DB_MASTER );
 		$conds = $this->pageCond();