Merge "Fix order of @var parameter in PHP"

[lhc/web/wiklou.git] / resources / src / mediawiki.rcfilters / dm / FilterItem.js

diff --git a/resources/src/mediawiki.rcfilters/dm/FilterItem.js b/resources/src/mediawiki.rcfilters/dm/FilterItem.js
index 8725f51..50057af 100644 (file)
--- a/resources/src/mediawiki.rcfilters/dm/FilterItem.js
+++ b/resources/src/mediawiki.rcfilters/dm/FilterItem.js
@@ -64,11 +64,10 @@ FilterItem.prototype.getState = function () {
 /**
  * Get the message for the display area for the currently active conflict
  *
- * @private
  * @return {string} Conflict result message key
  */
 FilterItem.prototype.getCurrentConflictResultMessage = function () {
-       var details = {};
+       var details;
 
        // First look in filter's own conflicts
        details = this.getConflictDetails( this.getOwnConflicts(), 'globalDescription' );