Permalink
Browse files

Merge branch 'v2.0Kohana3.0' of ssh://dev2.winterroot.net/var/www/git…

…/fullobject into v2.0Kohana3.0
  • Loading branch information...
2 parents baa73fa + 0a85a55 commit d1d1e263076d47792839d6a5e11745568d3abc16 Thiago de Mello Bueno committed May 3, 2011
Showing with 25 additions and 12 deletions.
  1. +25 −12 modules/mopcore/classes/controller/ajax.php
@@ -63,15 +63,22 @@ public function action_html($uri)
}
$html = $subRequest->execute()->body();
+
$cssResources = array();
- array_push($cssResources, $this->resources['librarycss']);
- array_push($cssResources, $this->resources['css']);
- $cssResources = array_values($cssResources);
+ foreach($this->resources['librarycss'] as $css){
+ array_push($cssResources, $css);
+ }
+ foreach($this->resources['css'] as $css){
+ array_push($cssResources, $css);
+ }
$jsResources = array();
- array_push($jsResources, $this->resources['libraryjs']);
- array_push($jsResources, $this->resources['js']);
- $jsResources = array_values($jsResources);
+ foreach($this->resources['libraryjs'] as $js){
+ array_push($jsResources, $js);
+ }
+ foreach($this->resources['js'] as $js){
+ array_push($jsResources, $js);
+ }
$ajaxResponse = array(
'response'=>array(
@@ -103,14 +110,20 @@ public function action_compound($uri)
$cssResources = array();
- array_push($cssResources, $this->resources['librarycss']);
- array_push($cssResources, $this->resources['css']);
- $cssResources = array_values($cssResources);
+ foreach($this->resources['librarycss'] as $css){
+ array_push($cssResources, $css);
+ }
+ foreach($this->resources['css'] as $css){
+ array_push($cssResources, $css);
+ }
$jsResources = array();
- array_push($jsResources, $this->resources['libraryjs']);
- array_push($jsResources, $this->resources['js']);
- $jsResources = array_values($jsResources);
+ foreach($this->resources['libraryjs'] as $js){
+ array_push($jsResources, $js);
+ }
+ foreach($this->resources['js'] as $js){
+ array_push($jsResources, $js);
+ }
$compoundResponse = array(

0 comments on commit d1d1e26

Please sign in to comment.