Permalink
Browse files

Fixed js/css again

  • Loading branch information...
1 parent ae0d75e commit 0a85a55b8ca2c4d3836e0e53909d113a0ba56d5d @deepwinter deepwinter 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 0a85a55

Please sign in to comment.