From: moodler <moodler>
Date: Mon, 2 Oct 2006 15:15:23 +0000 (+0000)
Subject: Be a bit more flexible with the extra paths (can be a string or an array)
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=53d052d029774be181998f98dfe94d427f4bd1e0;p=moodle.git

Be a bit more flexible with the extra paths (can be a string or an array)
---

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 944916a549..73536f6a06 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -4266,7 +4266,13 @@ function get_string($identifier, $module='', $a=NULL, $extralocations=NULL) {
     $locations = array();
 
     if (!empty($extralocations)) {   // Calling code has a good idea where to look
-        $locations += $extralocations;
+        if (is_array($extralocations)) {
+            $locations += $extralocations;
+        } else if (is_string($extralocations)) {
+            $locations[] = $extralocations;
+        } else {
+            debugging('Bad lang path provided');
+        }
     }
 
     if (isset($CFG->running_installer)) {