Merge branch 'master' into talmdal_dev

Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php

1 files changed, 2 insertions, 4 deletions

diff --git a/modules/gallery/controllers/combined.php b/modules/gallery/controllers/combined.php
index c1f42bfe..e90a2f1a 100644
--- a/modules/gallery/controllers/combined.php
+++ b/modules/gallery/controllers/combined.php
@@ -22,7 +22,6 @@ class Combined_Controller extends Controller {
    * Return the combined Javascript bundle associated with the given key.
    */
   public function javascript($key) {
-    $key = substr($key, 0, strlen($key) - 3);  // strip off the trailing .js
     return $this->_emit("javascript", $key);
   }
 
@@ -30,7 +29,6 @@ class Combined_Controller extends Controller {
    * Return the combined CSS bundle associated with the given key.
    */
   public function css($key) {
-    $key = substr($key, 0, strlen($key) - 4);  // strip off the trailing .css
     return $this->_emit("css", $key);
   }
 
@@ -56,7 +54,7 @@ class Combined_Controller extends Controller {
     }
 
     if (empty($key)) {
-      Kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     $cache = Cache::instance();
@@ -71,7 +69,7 @@ class Combined_Controller extends Controller {
       $content = $cache->get($key);
     }
     if (empty($content)) {
-      Kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     // $type is either 'javascript' or 'css'