bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #6465 from annando/theme-fix

Browse source 
Bugfix: Theme functions hadn't been executed anymore
This commit is contained in:
Tobias Diekershoff 2019-01-19 07:24:05 +01:00 committed by GitHub
commit 8bd04cb515
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/App.php
View file

@ -1720,6 +1720,12 @@ class App
$content = ''; $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 // Call module functions
if ($this->module_loaded) { if ($this->module_loaded) {
$this->page['page_title'] = $this->module; $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 // initialise content region
if ($this->getMode()->isNormal()) { if ($this->getMode()->isNormal()) {
Core\Addon::callHooks('page_content_top', $this->page['content']); Core\Addon::callHooks('page_content_top', $this->page['content']);

12
view/theme/vier/theme.php
View file

@ -313,10 +313,6 @@ function vier_community_info()
/// @TODO This whole thing is hard-coded, better rewrite to Intercepting Filter Pattern (future-todo) /// @TODO This whole thing is hard-coded, better rewrite to Intercepting Filter Pattern (future-todo)
$r = []; $r = [];
if (Addon::isEnabled("appnet")) {
$r[] = ["photo" => "images/appnet.png", "name" => "App.net"];
}
if (Addon::isEnabled("buffer")) { if (Addon::isEnabled("buffer")) {
$r[] = ["photo" => "images/buffer.png", "name" => "Buffer"]; $r[] = ["photo" => "images/buffer.png", "name" => "Buffer"];
} }
@ -329,10 +325,6 @@ function vier_community_info()
$r[] = ["photo" => "images/dreamwidth.png", "name" => "Dreamwidth"]; $r[] = ["photo" => "images/dreamwidth.png", "name" => "Dreamwidth"];
} }
if (Addon::isEnabled("fbpost")) {
$r[] = ["photo" => "images/facebook.png", "name" => "Facebook"];
}
if (Addon::isEnabled("ifttt")) { if (Addon::isEnabled("ifttt")) {
$r[] = ["photo" => "addon/ifttt/ifttt.png", "name" => "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"]; $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)? /// @TODO old-lost code (and below)?
//if (Addon::isEnabled("ijpost")) { //if (Addon::isEnabled("ijpost")) {
// $r[] = array("photo" => "images/", "name" => ""); // $r[] = array("photo" => "images/", "name" => "");