Changeset 2545

Timestamp:

04/20/08 18:39:42 (4 months ago)

Author:

JAAulde

Message:

merging r2544 from trunk to releases/2.1.2

Files:

• releases/2.1.2/modules/media/controllers/media.php (modified) (2 diffs)

releases/2.1.2/modules/media/controllers/media.php

@@ -53 +53 @@
     }
 
-    public function css($querystr)
-    {
+    public function css()
+    {
+        $querystr = implode('/', $this->uri->argument_array());
+
         // Find all the individual files
         $files = explode($this->separator, $querystr);
@@ -84 +86 @@
     }
 
-    public function js($querystr)
-    {   
+    public function js()
+    {
+        $querystr = implode('/', $this->uri->argument_array());
+
         // Find all the individual files
         $files = explode($this->separator, $querystr);