From 0604e03bf95fe4d33a33e1e2d8a6398107407043 Mon Sep 17 00:00:00 2001
From: Shane Elliott <shane@pukunui.com>
Date: Tue, 16 Jul 2013 16:55:12 +0800
Subject: [PATCH] MDL-40684 Fix conditional field name for custom user fields

---
 lib/conditionlib.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/conditionlib.php b/lib/conditionlib.php
index 00af5730e1c..3bf7a8f8f3b 100644
--- a/lib/conditionlib.php
+++ b/lib/conditionlib.php
@@ -829,7 +829,11 @@ abstract class condition_info_base {
             foreach ($this->item->conditionsfield as $field => $details) {
                 $a = new stdclass;
                 // Display the fieldname into current lang.
-                $translatedfieldname = get_user_field_name($details->fieldname);
+                if (is_numeric($field)) {
+                    $translatedfieldname = $details->fieldname;
+                } else {
+                    $translatedfieldname = get_user_field_name($details->fieldname);
+                }
                 $a->field = format_string($translatedfieldname, true, array('context' => $context));
                 $a->value = s($details->value);
                 $information .= html_writer::start_tag('li');