dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Update help icon from OOUI"
[lhc/web/wiklou.git]
/
includes
/
page
/
Article.php
diff --git
a/includes/page/Article.php
b/includes/page/Article.php
index
6f3162d
..
22363bf
100644
(file)
--- 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 ) {
* @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 ) {
* @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 );
}
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 ) {
* @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 );
}
return $this->mPage->commitRollback( $fromP, $summary, $bot, $resultDetails, $guser );
}