Merge branch 'master' of git@github.com:gallery/gallery3

1 files changed, 2 insertions, 2 deletions

diff --git a/modules/gallery/controllers/javascript.php b/modules/gallery/controllers/combined.php
index ba5cbf4b..510482db 100644
--- a/modules/gallery/controllers/javascript.php
+++ b/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();