https://www.mediawiki.org/wiki/Special:Code/MediaWiki/102183

Revision: 102183
Author:   ialex
Date:     2011-11-06 18:16:54 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
Removed second parameter to Title::userCan() and changed it to quickUserCan() 
where needed

Modified Paths:
--------------
    trunk/extensions/ForcePreview/ForcePreview.php
    trunk/extensions/ImageTagging/ImageTagPage.php
    trunk/extensions/LiquidThreads/classes/Hooks.php
    trunk/extensions/LogEntry/LogEntry.page.php
    trunk/extensions/Postcomment/Postcomment.php
    trunk/extensions/ReplaceText/SpecialReplaceText.php

Modified: trunk/extensions/ForcePreview/ForcePreview.php
===================================================================
--- trunk/extensions/ForcePreview/ForcePreview.php      2011-11-06 15:38:48 UTC 
(rev 102182)
+++ trunk/extensions/ForcePreview/ForcePreview.php      2011-11-06 18:16:54 UTC 
(rev 102183)
@@ -78,7 +78,7 @@
 
 function efForcePreviewLivePreview( &$out, $sk = null ) {
        global $wgUser, $wgRequest, $wgLivePreview, $wgTitle;
-       if( !$wgLivePreview || !$wgTitle->userCan( 'edit', true ) ) {
+       if( !$wgLivePreview || !$wgTitle->userCan( 'edit' ) ) {
                return true;
        }
        if(

Modified: trunk/extensions/ImageTagging/ImageTagPage.php
===================================================================
--- trunk/extensions/ImageTagging/ImageTagPage.php      2011-11-06 15:38:48 UTC 
(rev 102182)
+++ trunk/extensions/ImageTagging/ImageTagPage.php      2011-11-06 18:16:54 UTC 
(rev 102183)
@@ -20,7 +20,7 @@
 
                if (
                        $wgUser->isAllowed( 'edit' ) &&
-                       $this->mTitle->userCan( 'edit', true ) &&
+                       $this->mTitle->userCan( 'edit' ) &&
                        ( $this->mTitle->isProtected( 'edit' ) == false || 
in_array( 'sysop', $wgUser->getGroups() ) )
                )
                {

Modified: trunk/extensions/LiquidThreads/classes/Hooks.php
===================================================================
--- trunk/extensions/LiquidThreads/classes/Hooks.php    2011-11-06 15:38:48 UTC 
(rev 102182)
+++ trunk/extensions/LiquidThreads/classes/Hooks.php    2011-11-06 18:16:54 UTC 
(rev 102183)
@@ -769,7 +769,7 @@
 
                $talkpage = $thread->article();
 
-               $canRead = $talkpage->getTitle()->userCan( 'read', false );
+               $canRead = $talkpage->getTitle()->quickUserCan( 'read' );
 
                if ( $canRead ) {
                        return true;

Modified: trunk/extensions/LogEntry/LogEntry.page.php
===================================================================
--- trunk/extensions/LogEntry/LogEntry.page.php 2011-11-06 15:38:48 UTC (rev 
102182)
+++ trunk/extensions/LogEntry/LogEntry.page.php 2011-11-06 18:16:54 UTC (rev 
102183)
@@ -40,7 +40,7 @@
                        $title = Title::newFromText( $page );
                        
                        // Check permissions
-                       if( $title && $title->userCan( 'edit', $page ) )
+                       if( $title && $title->userCan( 'edit' ) )
                        {
                                // Get article
                                $article = new Article( $title, 0 );

Modified: trunk/extensions/Postcomment/Postcomment.php
===================================================================
--- trunk/extensions/Postcomment/Postcomment.php        2011-11-06 15:38:48 UTC 
(rev 102182)
+++ trunk/extensions/Postcomment/Postcomment.php        2011-11-06 18:16:54 UTC 
(rev 102183)
@@ -127,7 +127,7 @@
                return true;
        }
 
-       if ( !$title->userCan( 'edit', true ) ) {
+       if ( !$title->userCan( 'edit' ) ) {
                $data .= wfMsgHtml( 'postcomment_discussionprotected' );
                return true;
        }

Modified: trunk/extensions/ReplaceText/SpecialReplaceText.php
===================================================================
--- trunk/extensions/ReplaceText/SpecialReplaceText.php 2011-11-06 15:38:48 UTC 
(rev 102182)
+++ trunk/extensions/ReplaceText/SpecialReplaceText.php 2011-11-06 18:16:54 UTC 
(rev 102183)
@@ -163,7 +163,7 @@
                                        }
                                        $new_title = Title::makeTitleSafe( 
$row->page_namespace, $new_page_name );
                                        $err = $title->isValidMoveOperation( 
$new_title );
-                                       if ( $title->userCan( 'move', true ) && 
!is_array( $err ) ) {
+                                       if ( $title->userCan( 'move' ) && 
!is_array( $err ) ) {
                                                $titles_for_move[] = $title;
                                        } else {
                                                $unmoveable_titles[] = $title;


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to