fixed filtering of external files array and suppressed warning in external files...

git-svn-id: http://code.elgg.org/elgg/trunk@8998 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index a800aca7ae8a81006d3d1563c13277284b0eb6f2..6c94133dfae5e1e6a6e47c065a446aa63072a353 100644 (file)
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -400,7 +400,7 @@ function elgg_get_loaded_external_files($type, $location) {
        if (isset($CONFIG->externals) && isset($CONFIG->externals[$type])) {
                $items = array_values($CONFIG->externals[$type]);
 
-               $callback = "return \$v->loaded == true && \$v->location == $location;";
+               $callback = "return \$v->loaded == true && \$v->location == '$location';";
                $items = array_filter($items, create_function('$v', $callback));
                if ($items) {
                        usort($items, create_function('$a,$b','return $a->priority >= $b->priority;'));

diff --git a/engine/tests/api/helpers.php b/engine/tests/api/helpers.php
index 1362b3c9d65fcbfc3489b9cdf439218732c1832b..461627547c17cc8e283d64be16cb08c15a886380 100644 (file)
--- a/engine/tests/api/helpers.php
+++ b/engine/tests/api/helpers.php
@@ -109,7 +109,7 @@ class ElggCoreHelpersTest extends ElggCoreUnitTest {
                $this->assertIdentical('http://test1.com', $CONFIG->externals['js']['key']->url);
 
                // send a bad url
-               $result = elgg_register_js();
+               $result = @elgg_register_js('bad');
                $this->assertFalse($result);
        }
 
@@ -140,7 +140,7 @@ class ElggCoreHelpersTest extends ElggCoreUnitTest {
 
                $result = elgg_unregister_js('id1');
                $this->assertTrue($result);
-               $this->assertNULL($CONFIG->externals['js']['head']['id1']);
+               @$this->assertNULL($CONFIG->externals['js']['head']['id1']);
 
                $result = elgg_unregister_js('id1');
                $this->assertFalse($result);