X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fpage%2FArticle.php;h=22363bf37d219c57902ab5578f941a4ce995b504;hb=6782571d28445eeb9cd779c246ac736c0616b1eb;hp=6f3162dc5ce9add82b3bc693d5342da163f15f2e;hpb=e9a27a78e455de664144d0c3cfc789bcc411fab2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/page/Article.php b/includes/page/Article.php
index 6f3162dc5c..22363bf37d 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -2733,7 +2733,7 @@ class Article implements Page {
 	 * @see WikiPage::setTimestamp
 	 */
 	public function setTimestamp( $ts ) {
-		return $this->mPage->setTimestamp( $ts );
+		$this->mPage->setTimestamp( $ts );
 	}
 
 	/**
@@ -2857,7 +2857,10 @@ class Article implements Page {
 	 * @return array
 	 */
 	public function doRollback( $fromP, $summary, $token, $bot, &$resultDetails, User $user = null ) {
-		$user = is_null( $user ) ? $this->getContext()->getUser() : $user;
+		if ( !$user ) {
+			$user = $this->getContext()->getUser();
+		}
+
 		return $this->mPage->doRollback( $fromP, $summary, $token, $bot, $resultDetails, $user );
 	}
 
@@ -2870,7 +2873,10 @@ class Article implements Page {
 	 * @return array
 	 */
 	public function commitRollback( $fromP, $summary, $bot, &$resultDetails, User $guser = null ) {
-		$guser = is_null( $guser ) ? $this->getContext()->getUser() : $guser;
+		if ( !$guser ) {
+			$guser = $this->getContext()->getUser();
+		}
+
 		return $this->mPage->commitRollback( $fromP, $summary, $bot, $resultDetails, $guser );
 	}