Home
Documentation
Downloads
Demo
Tracker
Development
Translation
Moodle.net
Search
projects
/
moodle.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
610865f
)
MDL-15252 Fixing a typo in a function name and param type for array_merge()
author
David Mudrak
<david.mudrak@gmail.com>
Sun, 11 Apr 2010 07:42:51 +0000
(07:42 +0000)
committer
David Mudrak
<david.mudrak@gmail.com>
Sun, 11 Apr 2010 07:42:51 +0000
(07:42 +0000)
lib/moodlelib.php
patch
|
blob
|
blame
|
history
diff --git
a/lib/moodlelib.php
b/lib/moodlelib.php
index
7d0eaf6
..
bd8d343
100644
(file)
--- a/
lib/moodlelib.php
+++ b/
lib/moodlelib.php
@@
-5741,7
+5741,7
@@
class amos_string_manager implements string_manager {
}
/**
- * Returns depend
a
cies of current language, en is not included.
+ * Returns depend
en
cies of current language, en is not included.
* @param string $lang
* @return array all parents, the lang itself is last
*/
@@
-5760,7
+5760,7
@@
class amos_string_manager implements string_manager {
} else {
$parentlang = $string['parentlanguage'];
unset($string);
- return array_merge($this->get_language_dependenc
y($parentlang), $lang
);
+ return array_merge($this->get_language_dependenc
ies($parentlang), array($lang)
);
}
}