L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-39496-m' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2013-05-07 12:15:38 +01:00
parent 1795fc7ead 42b53d4650
commit 577f21ec24
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/adminlib.php
+6 -8
View File
@@ -871,7 +871,7 @@ class admin_category implements parentable_part_of_admin_tree {
* defaults to false
*/
public function locate($name, $findpath=false) {
if (is_array($this->category_cache) and !isset($this->category_cache[$this->name])) {
if (!isset($this->category_cache[$this->name])) {
// somebody much have purged the cache
$this->category_cache[$this->name] = $this;
}
@@ -885,7 +885,7 @@ class admin_category implements parentable_part_of_admin_tree {
}
// quick category lookup
if (!$findpath and is_array($this->category_cache) and isset($this->category_cache[$name])) {
if (!$findpath and isset($this->category_cache[$name])) {
return $this->category_cache[$name];
}
@@ -938,11 +938,9 @@ class admin_category implements parentable_part_of_admin_tree {
foreach($this->children as $precedence => $child) {
if ($child->name == $name) {
// clear cache and delete self
if (is_array($this->category_cache)) {
while($this->category_cache) {
// delete the cache, but keep the original array address
array_pop($this->category_cache);
}
while($this->category_cache) {
// delete the cache, but keep the original array address
array_pop($this->category_cache);
}
unset($this->children[$precedence]);
return true;
@@ -1010,7 +1008,7 @@ class admin_category implements parentable_part_of_admin_tree {
);
}
}
if (is_array($this->category_cache) and ($something instanceof admin_category)) {
if ($something instanceof admin_category) {
if (isset($this->category_cache[$something->name])) {
debugging('Duplicate admin category name: '.$something->name);
} else {