summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/user/user.admin.inc9
1 files changed, 7 insertions, 2 deletions
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index 56f16db9a..1ec09bf1f 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -50,10 +50,15 @@ function user_filter_form() {
);
foreach ($session as $filter) {
list($type, $value) = $filter;
- $string = ($i++ ? '<em>and</em> where <strong>%a</strong> is <strong>%b</strong>' : '<strong>%a</strong> is <strong>%b</strong>');
// Merge an array of arrays into one if necessary.
$options = $type == 'permission' ? call_user_func_array('array_merge', $filters[$type]['options']) : $filters[$type]['options'];
- $form['filters']['current'][] = array('#value' => t($string, array('%a' => $filters[$type]['title'] , '%b' => $options[$value])));
+ $params = array('%property' => $filters[$type]['title'] , '%value' => $options[$value]);
+ if ($i++ > 0) {
+ $form['filters']['current'][] = array('#value' => t('<em>and</em> where <strong>%property</strong> is <strong>%value</strong>', $params));
+ }
+ else {
+ $form['filters']['current'][] = array('#value' => t('<strong>%property</strong> is <strong>%value</strong>', $params));
+ }
}
foreach ($filters as $key => $filter) {