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, 1 deletions

diff --git a/modules/gallery/controllers/admin_advanced_settings.php b/modules/gallery/controllers/admin_advanced_settings.php
index 79bc1183..391d2598 100644
--- a/modules/gallery/controllers/admin_advanced_settings.php
+++ b/modules/gallery/controllers/admin_advanced_settings.php
@@ -22,7 +22,8 @@ class Admin_Advanced_Settings_Controller extends Admin_Controller {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_advanced_settings.html");
     $view->content->vars = ORM::factory("var")
-      ->orderby("module_name", "name")
+      ->order_by("module_name")
+      ->order_by("name")
       ->find_all();
     print $view;
   }