Merge branch 'MDL-27717_MOODLE_19_STABLE' into MOODLE_19_STABLE

moodle · Jul 25, 2011 · fdee5d9 · fdee5d9
2 parents ba4dfc9 + 10fbf4d
commit fdee5d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/enrol/authorize/enrol.php b/enrol/authorize/enrol.php
@@ -71,7 +71,7 @@ function print_entry($course) {
             $curcost = get_course_cost($course);
             echo '<div class="mdl-align">';
             echo '<p>'.get_string('paymentrequired').'</p>';
-            echo '<p><b>'.get_string('cost').": $curcost[currency] $curcost[cost]".'</b></p>';
+            echo '<p><b>'.get_string('cost').': '. $curcost['currency'] . $curcost['localizedcost'] .'</b></p>';
             echo '<p><a href="'.$CFG->httpswwwroot.'/login/">'.get_string('loginsite').'</a></p>';
             echo '</div>';
         }
@@ -387,7 +387,7 @@ function get_access_icons($course) {
             }
 
             $str .= '<div class="cost" title="'.$strrequirespayment.'">'.$strcost.': ';
-            $str .= $currency . ' ' . $curcost['cost'].'</div>';
+            $str .= $currency . ' ' . $curcost['localizedcost'].'</div>';
         }
 
         return $str;

diff --git a/enrol/authorize/localfuncs.php b/enrol/authorize/localfuncs.php
@@ -12,10 +12,11 @@ function get_course_cost($course)
     if (!empty($course->cost)) {
         $cost = (float)(((float)$course->cost) < 0) ? $CFG->enrol_cost : $course->cost;
     }
-
-    $cost = format_float($cost, 2);
+    $costlocalizeddisplay = format_float($cost, 2);
+    $cost = format_float($cost, 2, false);
     $ret = array(
         'cost' => $cost,
+        'localizedcost' => $costlocalizeddisplay,
         'currency' => $currency
     );