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

diff --git a/modules/gallery/controllers/admin_dashboard.php b/modules/gallery/controllers/admin_dashboard.php
index 7e28f625..5f2cb41d 100644
--- a/modules/gallery/controllers/admin_dashboard.php
+++ b/modules/gallery/controllers/admin_dashboard.php
@@ -86,7 +86,7 @@ class Admin_Dashboard_Controller extends Admin_Controller {
 
     foreach (array("dashboard_sidebar", "dashboard_center") as $location) {
       $new_blocks = array();
-      foreach ($this->input->get($location, array()) as $id) {
+      foreach (Input::instance()->get($location, array()) as $id) {
         $new_blocks[$id] = $active_set[$id];
       }
       block_manager::set_active($location, $new_blocks);