From: bsitu <bsitu@wikimedia.org>
Date: Tue, 5 Aug 2014 21:23:58 +0000 (-0700)
Subject: Followup I4049b666: "Removing prefix exception for HTMLCheckMatrix"
X-Git-Tag: 1.31.0-rc.0~14435^2
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=0f079ab390baf1323583a9dc44dfecf168511ee1;p=lhc%2Fweb%2Fwiklou.git

Followup I4049b666: "Removing prefix exception for HTMLCheckMatrix"

Change I4049b666 changed the way Preferences combines the prefix with
the row and column for HTMLCheckMatrix, but did not adjust the
corresponding code in User::getOptionFromUser().

Bug: 69146
Change-Id: I69ed9c875443ba44d1a5e12e51165ebf8d6d6a06
---

diff --git a/includes/User.php b/includes/User.php
index fe4118782b..7e846ad301 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2733,7 +2733,7 @@ class User implements IDBAccessObject {
 
 				foreach ( $columns as $column ) {
 					foreach ( $rows as $row ) {
-						$checkmatrixOptions["$prefix-$column-$row"] = true;
+						$checkmatrixOptions["$prefix$column-$row"] = true;
 					}
 				}