From: jenkins-bot Date: Tue, 16 Apr 2019 20:16:47 +0000 (+0000) Subject: Merge "changetags: $param type should be string and not array" X-Git-Tag: 1.34.0-rc.0~1946 X-Git-Url: http://git.cyclocoop.org//%27http:/jquery.khurshid.com/ifixpng.php/%27?a=commitdiff_plain;h=6ac13382225eb0c140dad8227b5b251b5bc1ef24;hp=be0acf65b72a59ace6c2f1c9078b715e996b65e2;p=lhc%2Fweb%2Fwiklou.git Merge "changetags: $param type should be string and not array" --- diff --git a/includes/changetags/ChangeTags.php b/includes/changetags/ChangeTags.php index 3a93e57611..2169a4d72e 100644 --- a/includes/changetags/ChangeTags.php +++ b/includes/changetags/ChangeTags.php @@ -604,7 +604,7 @@ class ChangeTags { * @param int|null $rc_id The rc_id of the change to add the tags to * @param int|null $rev_id The rev_id of the change to add the tags to * @param int|null $log_id The log_id of the change to add the tags to - * @param string $params Params to put in the ct_params field of table + * @param string|null $params Params to put in the ct_params field of table * 'change_tag' when adding tags * @param string $reason Comment for the log * @param User $user Who to give credit for the action diff --git a/includes/changetags/ChangeTagsLogList.php b/includes/changetags/ChangeTagsLogList.php index 7e1f1d1e30..bf455af817 100644 --- a/includes/changetags/ChangeTagsLogList.php +++ b/includes/changetags/ChangeTagsLogList.php @@ -66,7 +66,7 @@ class ChangeTagsLogList extends ChangeTagsList { * * @param array $tagsToAdd * @param array $tagsToRemove - * @param array $params + * @param string|null $params * @param string $reason * @param User $user * @return Status