Revert "Use call_user_func instead of call_user_func_array as we don't need to pass the parameters by reference."

This reverts commit 75cc4962a2c945e3e3ad37fda3b5de32d512b929.

1 files changed, 7 insertions, 4 deletions

diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php
index c75aebaa..dc421ee1 100644
--- a/modules/gallery/controllers/admin_theme_options.php
+++ b/modules/gallery/controllers/admin_theme_options.php
@@ -28,8 +28,8 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
     // Don't use the Kohana cascading file system because we don't want to mess up the admin theme
     $theme_helper = THEMEPATH . "$theme_name/helpers/{$theme_name}.php";
     @require_once($theme_helper);
-    $view->content->form =
-      call_user_func("{$theme_name}::get_admin_form", "admin/theme_options/save/");
+    $view->content->form = call_user_func_array(array(theme::$site, "get_admin_form"),
+                                                array("admin/theme_options/save/"));
 
     $view->content->title = t("%name options", array("name" => $info->name));
 
@@ -46,9 +46,12 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
 
     $info = theme::get_info($theme_name);
 
-    $form = call_user_func("{$theme_name}::get_admin_form", "admin/theme_options/save/");
+    $form = call_user_func_array(array(theme::$site, "get_admin_form"),
+                                 array("admin/theme_options/save/"));
     if ($form->validate()) {
-      call_user_func("{$theme_name}::update_options", $form);
+
+      $view->content->form = call_user_func_array(array(theme::$site, "update_options"),
+                                                  array($form));
 
       message::success(t("Updated %name options", array("name" => $info->name)));
       url::redirect("admin/theme_options");