From: stronk7 <stronk7>
Date: Sat, 7 Oct 2006 10:33:58 +0000 (+0000)
Subject: Allow load average to be displayed in servers using the comma as
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=dd00dbd7990e7a21066c8fc91076180ac711d0b4;p=moodle.git

Allow load average to be displayed in servers using the comma as
decimal separator.
---

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 16fabf8d0c..29bb598ff8 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -6548,7 +6548,7 @@ function get_performance_info() {
         list($server_load) = explode(' ', $loadavg[0]);
         unset($loadavg);
     } else if ( function_exists('is_executable') && is_executable('/usr/bin/uptime') && $loadavg = `/usr/bin/uptime` ) {
-        if (preg_match('/load averages?: (\d+[\.:]\d+)/', $loadavg, $matches)) {
+        if (preg_match('/load averages?: (\d+[\.,:]\d+)/', $loadavg, $matches)) {
             $server_load = $matches[1];
         } else {
             trigger_error('Could not parse uptime output!');