X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=blobdiff_plain;f=includes%2FTitle.php;h=8c5bbdc221f3f853f7874b04f48b45f85a8e19bb;hb=fb3428eb8f16235269fb34a98fab664c3732cba2;hp=f6818525d82f7c7907b264a915468fc76a0c39ec;hpb=4304174a4c6ccea53377071462a4ac5330bf5c98;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Title.php b/includes/Title.php
index f6818525d8..8c5bbdc221 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1250,6 +1250,7 @@ class Title implements LinkTarget, IDBAccessObject {
 	 * @param int|int[] $namespaces,... The namespaces to check for
 	 * @return bool
 	 * @since 1.19
+	 * @suppress PhanCommentParamOnEmptyParamList Cannot make variadic due to HHVM bug, T191668#5263929
 	 */
 	public function inNamespaces( /* ... */ ) {
 		$namespaces = func_get_args();
@@ -2499,6 +2500,7 @@ class Title implements LinkTarget, IDBAccessObject {
 	 * Determines if $user is unable to edit this page because it has been protected
 	 * by $wgNamespaceProtection.
 	 *
+	 * @deprecated since 1.34 Don't use this function in new code.
 	 * @param User $user User object to check permissions
 	 * @return bool
 	 */
@@ -2506,8 +2508,9 @@ class Title implements LinkTarget, IDBAccessObject {
 		global $wgNamespaceProtection;
 
 		if ( isset( $wgNamespaceProtection[$this->mNamespace] ) ) {
+			$permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
 			foreach ( (array)$wgNamespaceProtection[$this->mNamespace] as $right ) {
-				if ( $right != '' && !$user->isAllowed( $right ) ) {
+				if ( !$permissionManager->userHasRight( $user, $right ) ) {
 					return true;
 				}
 			}
@@ -3183,7 +3186,7 @@ class Title implements LinkTarget, IDBAccessObject {
 	public static function capitalize( $text, $ns = NS_MAIN ) {
 		$services = MediaWikiServices::getInstance();
 		if ( $services->getNamespaceInfo()->isCapitalized( $ns ) ) {
-			return MediaWikiServices::getInstance()->getContentLanguage()->ucfirst( $text );
+			return $services->getContentLanguage()->ucfirst( $text );
 		} else {
 			return $text;
 		}