← All changes | inc/conflicts/abstract_conflict.php +3 -3 2.5.6 → trunk View file →

		@@ -89,9 +89,9 @@
89	89	* @return bool
90	90	* @since 2.0.6
91	91	* @access public
92	92	*/
93		- public function is_active( $dismissed_conflicts = array() ) {
	93	+ public function is_active( $dismissed_conflicts = [] ) {
94	94	$conflict_id = $this->get_id();
95	95	if ( isset( $dismissed_conflicts[ $conflict_id ] ) && $dismissed_conflicts[ $conflict_id ] === 'true' ) {
96	96	return false;
97	97	}
		@@ -130,13 +130,13 @@
130	130	* @since 2.0.6
131	131	* @access public
132	132	*/
133	133	public function get_conflict() {
134		- return array(
	134	+ return [
135	135	'id' => $this->get_id(),
136	136	'type' => $this->type,
137	137	'priority' => $this->priority,
138	138	'severity' => $this->severity,
139	139	'message' => $this->message,
140		- );
	140	+ ];
141	141	}
142	142	}