Move theme selection to init() in mod/admin

diff --git a/mod/admin.php b/mod/admin.php
index 1cbe24e71d989bad74988fcfb3059ba939c8c0da..24b8b29a1b474b5154dcf7c215e097c4acee6cc9 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -33,6 +33,21 @@ use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 
+/**
+ * Sets the current theme for theme settings pages. This needs to be done before the post() or content() are called
+ *
+ * @param App $a
+ */
+function admin_init(App $a)
+{
+       if ($a->argc > 2 && $a->argv[1] == 'themes') {
+               $theme = $a->argv[2];
+               if (is_file("view/theme/$theme/config.php")) {
+                       $a->setCurrentTheme($theme);
+               }
+       }
+}
+
 /**
  * @brief Process send data from the admin panels subpages
  *
@@ -89,15 +104,8 @@ function admin_post(App $a)
 
                                $theme = $a->argv[2];
                                if (is_file("view/theme/$theme/config.php")) {
-                                       $a->setCurrentTheme($theme);
-
-                                       require_once "view/theme/$theme/theme.php";
                                        require_once "view/theme/$theme/config.php";
 
-                                       $init = $theme . '_init';
-                                       if (function_exists($init)) {
-                                               $init($a);
-                                       }
                                        if (function_exists('theme_admin_post')) {
                                                theme_admin_post($a);
                                        }
@@ -2306,16 +2314,8 @@ function admin_page_themes(App $a)
 
                $admin_form = '';
                if (is_file("view/theme/$theme/config.php")) {
-                       $a->setCurrentTheme($theme);
-
-                       require_once "view/theme/$theme/theme.php";
                        require_once "view/theme/$theme/config.php";
 
-                       $init = $theme . "_init";
-                       if (function_exists($init)) {
-                               $init($a);
-                       }
-
                        if (function_exists('theme_admin')) {
                                $admin_form = theme_admin($a);
                        }