Fixes bug in package manager

SourceCode · SourceCode · commit 1607ec4dad51 · 2015-01-23T22:03:16.000-08:00
diff --git a/system/core/package.php b/system/core/package.php
@@ -100,13 +100,14 @@ public function getPackages(array $packageList)
         $css = array(); $js = array();
         foreach($packageList as $package)
         {
-            $item = $this->getPackage[$package];
+            $item = $this->getPackage($package);
             if ($item != false)
             {
-                if (is_array($item['css'])) array_merge($css, $item['css']);
-                if (is_array($item['js'])) array_merge($js, $item['js']);
+                if (is_array($item['css'])) $css = array_merge($css, $item['css']);
+                if (is_array($item['js'])) $js = array_merge($js, $item['js']);
             }   
         }
+        
         return array('css' => $css, 'js' => $js);
     }
     

Original file line number	Diff line number	Diff line change
`@@ -100,13 +100,14 @@ public function getPackages(array $packageList)`
`100`	`100`	`$css = array(); $js = array();`
`101`	`101`	`foreach($packageList as $package)`
`102`	`102`	`{`
`103`		`- $item = $this->getPackage[$package];`
	`103`	`+ $item = $this->getPackage($package);`
`104`	`104`	`if ($item != false)`
`105`	`105`	`{`
`106`		`- if (is_array($item['css'])) array_merge($css, $item['css']);`
`107`		`- if (is_array($item['js'])) array_merge($js, $item['js']);`
	`106`	`+ if (is_array($item['css'])) $css = array_merge($css, $item['css']);`
	`107`	`+ if (is_array($item['js'])) $js = array_merge($js, $item['js']);`
`108`	`108`	`}`
`109`	`109`	`}`
	`110`	`+`
`110`	`111`	`return array('css' => $css, 'js' => $js);`
`111`	`112`	`}`
`112`	`113`