X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=inline;f=includes%2FOutputPage.php;h=14639aa86751b27a8aaac4aa4b93da7c9126dbfa;hb=3f67d38778da9f142f93e048bd5bbd6d1739a773;hp=b2ca53aa185ca47d8a8f107a7bcca103d27d5754;hpb=b3216f628984ca437c6a7f6a021ef221d5eead82;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index b2ca53aa18..14639aa867 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -44,7 +44,7 @@ use Wikimedia\WrappedStringList;
  * @todo document
  */
 class OutputPage extends ContextSource {
-	/** @var array Should be private. Used with addMeta() which adds "<meta>" */
+	/** @var string[][] Should be private. Used with addMeta() which adds "<meta>" */
 	protected $mMetatags = [];
 
 	/** @var array */
@@ -995,6 +995,8 @@ class OutputPage extends ContextSource {
 	 * @param Title $t
 	 */
 	public function setTitle( Title $t ) {
+		// @phan-suppress-next-next-line PhanUndeclaredMethod
+		// @fixme Not all implementations of IContextSource have this method!
 		$this->getContext()->setTitle( $t );
 	}
 
@@ -1820,14 +1822,10 @@ class OutputPage extends ContextSource {
 	 * @param string $text Wikitext
 	 * @param Title $title
 	 * @param bool $linestart Is this the start of a line?
-	 * @param bool $tidy Whether to use tidy.
-	 *             Setting this to false (or omitting it) is deprecated
-	 *             since 1.32; all wikitext should be tidied.
 	 * @param bool $interface Whether it is an interface message
 	 *   (for example disables conversion)
 	 * @param string $wrapperClass if not empty, wraps the output in
 	 *   a `<div class="$wrapperClass">`
-	 * @private
 	 */
 	private function addWikiTextTitleInternal(
 		$text, Title $title, $linestart, $interface, $wrapperClass = null
@@ -3311,12 +3309,10 @@ class OutputPage extends ContextSource {
 			$vars['wgUserVariant'] = $contLang->getPreferredVariant();
 		}
 		// Same test as SkinTemplate
-		$vars['wgIsProbablyEditable'] = $title->quickUserCan( 'edit', $user )
-			&& ( $title->exists() || $title->quickUserCan( 'create', $user ) );
+		$vars['wgIsProbablyEditable'] = $this->userCanEditOrCreate( $user, $title );
 
-		$vars['wgRelevantPageIsProbablyEditable'] = $relevantTitle
-			&& $relevantTitle->quickUserCan( 'edit', $user )
-			&& ( $relevantTitle->exists() || $relevantTitle->quickUserCan( 'create', $user ) );
+		$vars['wgRelevantPageIsProbablyEditable'] = $relevantTitle &&
+			$this->userCanEditOrCreate( $user, $relevantTitle );
 
 		foreach ( $title->getRestrictionTypes() as $type ) {
 			// Following keys are set in $vars:
@@ -3383,6 +3379,21 @@ class OutputPage extends ContextSource {
 		return true;
 	}
 
+	/**
+	 * @param User $user
+	 * @param LinkTarget $title
+	 * @return bool
+	 */
+	private function userCanEditOrCreate(
+		User $user,
+		LinkTarget $title
+	) {
+		$pm = MediaWikiServices::getInstance()->getPermissionManager();
+		return $pm->quickUserCan( 'edit', $user, $title )
+		&& ( $this->getTitle()->exists() ||
+			 $pm->quickUserCan( 'create', $user, $title ) );
+	}
+
 	/**
 	 * @return array Array in format "link name or number => 'link html'".
 	 */
@@ -3447,11 +3458,7 @@ class OutputPage extends ContextSource {
 
 		# Universal edit button
 		if ( $config->get( 'UniversalEditButton' ) && $this->isArticleRelated() ) {
-			$user = $this->getUser();
-			if ( $this->getTitle()->quickUserCan( 'edit', $user )
-				&& ( $this->getTitle()->exists() ||
-					$this->getTitle()->quickUserCan( 'create', $user ) )
-			) {
+			if ( $this->userCanEditOrCreate( $this->getUser(), $this->getTitle() ) ) {
 				// Original UniversalEditButton
 				$msg = $this->msg( 'edit' )->text();
 				$tags['universal-edit-button'] = Html::element( 'link', [