Bugfix: Theme functions hadn't been executed anymore

diff --git a/src/App.php b/src/App.php
index ac513b531aaf2605782ec04fc330cc2aae8338a2..26c93b250029d9509168fbad703607775b92d083 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -1720,6 +1720,12 @@ class App
 
                $content = '';
 
+               // Load current theme info after module has been executed as theme could have been set in module
+               $theme_info_file = 'view/theme/' . $this->getCurrentTheme() . '/theme.php';
+               if (file_exists($theme_info_file)) {
+                       require_once $theme_info_file;
+               }
+
                // Call module functions
                if ($this->module_loaded) {
                        $this->page['page_title'] = $this->module;
@@ -1760,12 +1766,6 @@ class App
                        }
                }
 
-               // Load current theme info after module has been executed as theme could have been set in module
-               $theme_info_file = 'view/theme/' . $this->getCurrentTheme() . '/theme.php';
-               if (file_exists($theme_info_file)) {
-                       require_once $theme_info_file;
-               }
-
                // initialise content region
                if ($this->getMode()->isNormal()) {
                        Core\Addon::callHooks('page_content_top', $this->page['content']);

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index b9684ad8754ba7906a55be4c63fc7f6935b41d06..41553cf8c4aa765795bf81d5c98dbfd48d8d1175 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -313,10 +313,6 @@ function vier_community_info()
                /// @TODO This whole thing is hard-coded, better rewrite to Intercepting Filter Pattern (future-todo)
                $r = [];
 
-               if (Addon::isEnabled("appnet")) {
-                       $r[] = ["photo" => "images/appnet.png", "name" => "App.net"];
-               }
-
                if (Addon::isEnabled("buffer")) {
                        $r[] = ["photo" => "images/buffer.png", "name" => "Buffer"];
                }
@@ -329,10 +325,6 @@ function vier_community_info()
                        $r[] = ["photo" => "images/dreamwidth.png", "name" => "Dreamwidth"];
                }
 
-               if (Addon::isEnabled("fbpost")) {
-                       $r[] = ["photo" => "images/facebook.png", "name" => "Facebook"];
-               }
-
                if (Addon::isEnabled("ifttt")) {
                        $r[] = ["photo" => "addon/ifttt/ifttt.png", "name" => "IFTTT"];
                }
@@ -341,10 +333,6 @@ function vier_community_info()
                        $r[] = ["photo" => "images/gnusocial.png", "name" => "GNU Social"];
                }
 
-               if (Addon::isEnabled("gpluspost")) {
-                       $r[] = ["photo" => "images/googleplus.png", "name" => "Google+"];
-               }
-
                /// @TODO old-lost code (and below)?
                //if (Addon::isEnabled("ijpost")) {
                //      $r[] = array("photo" => "images/", "name" => "");