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 "logging: Start using LinkTarget & UserIdentity in ManualLogEntry"
[lhc/web/wiklou.git]
/
includes
/
logging
/
LogEntry.php
diff --git
a/includes/logging/LogEntry.php
b/includes/logging/LogEntry.php
index
7807e4c
..
35f1a06
100644
(file)
--- a/
includes/logging/LogEntry.php
+++ b/
includes/logging/LogEntry.php
@@
-464,8
+464,8
@@
class ManualLogEntry extends LogEntryBase {
/** @var int A rev id associated to the log entry */
protected $revId = 0;
/** @var int A rev id associated to the log entry */
protected $revId = 0;
- /** @var
array
Change tags add to the log entry */
- protected $tags =
null
;
+ /** @var
string[]
Change tags add to the log entry */
+ protected $tags =
[]
;
/** @var int Deletion state of the log entry */
protected $deleted;
/** @var int Deletion state of the log entry */
protected $deleted;
@@
-581,11
+581,16
@@
class ManualLogEntry extends LogEntryBase {
/**
* Set change tags for the log entry.
*
/**
* Set change tags for the log entry.
*
+ * Passing `null` means the same as empty array,
+ * for compatibility with WikiPage::doUpdateRestrictions().
+ *
* @since 1.27
* @since 1.27
- * @param string|string[] $tags
+ * @param string|string[]
|null
$tags
*/
public function setTags( $tags ) {
*/
public function setTags( $tags ) {
- if ( is_string( $tags ) ) {
+ if ( $tags === null ) {
+ $tags = [];
+ } elseif ( is_string( $tags ) ) {
$tags = [ $tags ];
}
$this->tags = $tags;
$tags = [ $tags ];
}
$this->tags = $tags;
@@
-778,11
+783,7
@@
class ManualLogEntry extends LogEntryBase {
if ( $to === 'rc' || $to === 'rcandudp' ) {
// save RC, passing tags so they are applied there
if ( $to === 'rc' || $to === 'rcandudp' ) {
// save RC, passing tags so they are applied there
- $tags = $this->getTags();
- if ( is_null( $tags ) ) {
- $tags = [];
- }
- $rc->addTags( $tags );
+ $rc->addTags( $this->getTags() );
$rc->save( $rc::SEND_NONE );
}
$rc->save( $rc::SEND_NONE );
}
@@
-842,7
+843,7
@@
class ManualLogEntry extends LogEntryBase {
/**
* @since 1.27
/**
* @since 1.27
- * @return
array
+ * @return
string[]
*/
public function getTags() {
return $this->tags;
*/
public function getTags() {
return $this->tags;