Rename the combined javascript controller from javascript/combined to…

… combined/javascript.
gallery · Jun 29, 2009 · d90e30c · d90e30c
1 parent bf79d43
commit d90e30c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/modules/gallery/controllers/javascript.php → modules/gallery/controllers/combined.php b/modules/gallery/controllers/javascript.php → modules/gallery/controllers/combined.php
@@ -17,8 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Javascript_Controller extends Controller {
-  public function combined($key) {
+class Combined_Controller extends Controller {
+  public function javascript($key) {
     if (preg_match('/[^0-9a-f]/', $key)) {
       // The key can't contain non-hex, so just terminate early
       Kohana::show_404();

diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
@@ -207,7 +207,7 @@ private function _combine_script() {
     }
 
     // Handcraft the script link because html::script will add a .js extenstion
-    return "<script type=\"text/javascript\" src=\"" . url::site("javascript/combined/$key") .
+    return "<script type=\"text/javascript\" src=\"" . url::site("combined/javascript/$key") .
       "\"></script>";
   }