Changeset 2529

Timestamp:

04/17/2008 08:35:37 PM (6 months ago)

Author:

JAAulde

Message:

merged r2528 from trunk to releases/2.1.2

Files:

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

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

@@ -29 +29 @@
                 parent::__construct();
 
-                $this->separator = Config::item('media.separator') or $this->separator = ',';
+                $this->separator = Config::item('media.separator') OR $this->separator = ',';
 
                 $cache = Config::item('media.cache');
@@ -40 +40 @@
                 else
                 {
-                        $this->cache_lifetime = Config::item('cache.lifetime') or $this->cache_lifetime = 1800;
+                        $this->cache_lifetime = Config::item('cache.lifetime') OR $this->cache_lifetime = 1800;
                 }
 
@@ -50 +50 @@
                 $this->pack_css = (bool) Config::item('media.pack_css');
                 $this->pack_js = Config::item('media.pack_js');
-                ($this->pack_js === TRUE) and $this->pack_js = 'Normal';
-        }
-
-        public function css($querystr)
-        {
+                ($this->pack_js === TRUE) AND $this->pack_js = 'Normal';
+        }
+
+        public function css($querystr = FALSE)
+        {
+                if( ! is_string($querystr))
+                {
+                        $querystr = implode('/', $this->uri->argument_array());
+                }
+                
                 // Find all the individual files
                 $files = explode($this->separator, $querystr);
 
                 $mimetype = Config::item('mimes.css');
-                $mimetype = (isset($mimetype[0])) ? $mimetype[0] : 'text/stylesheet';
-
-                $this->use_cache and $output = $this->cache->get('media.css.'.$querystr);
+                $mimetype = (isset($mimetype[0])) ? $mimetype[0] : 'text/css';
+
+                $this->use_cache AND $output = $this->cache->get('media.css.'.$querystr);
 
                 if ( ! isset($output) OR empty($output))
@@ -77 +82 @@
                         }
 
-                        ($this->use_cache) and $this->cache->set('media.css.'.$querystr, $data, array('media'), $this->cache_lifetime);
-                }
-
-                $mimetype and header('Content-type: '.$mimetype);
+                        ($this->use_cache) AND $this->cache->set('media.css.'.$querystr, $data, array('media'), $this->cache_lifetime);
+                }
+
+                $mimetype AND header('Content-type: '.$mimetype);
                 echo $output;
         }
 
-        public function js($querystr)
-        {
+        public function js($querystr = FALSE)
+        {
+                if( ! is_string($querystr))
+                {
+                        $querystr = implode('/', $this->uri->argument_array());
+                }
+                
                 // Find all the individual files
                 $files = explode($this->separator, $querystr);
 
                 $mimetype = Config::item('mimes.js');
-                $mimetype = (isset($mimetype[0])) ? $mimetype[0] : 'text/javascript';
+                $mimetype = (isset($mimetype[0])) ? $mimetype[0] : 'application/x-javascript';
 
                 $this->use_cache AND $output = $this->cache->get('media.js.'.$querystr);
@@ -109 +119 @@
                         }
 
-                        ($this->use_cache) and $this->cache->set('media.js.'.$querystr, $data, array('media'), $this->cache_lifetime);
-                }
-
-                $mimetype and header('Content-type: '.$mimetype);
+                        ($this->use_cache) AND $this->cache->set('media.js.'.$querystr, $data, array('media'), $this->cache_lifetime);
+                }
+
+                $mimetype AND header('Content-type: '.$mimetype);
                 echo $output;
         }
@@ -174 +184 @@
                         }
 
-                        (isset($view)) and $filedata[$filename] = $view->render();
+                        (isset($view)) AND $filedata[$filename] = $view->render();
                 }