oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-12 01:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace current_theme() and current_theme_url() calls

Browse source
This commit is contained in:
Hypolite Petovan 2018-04-28 18:37:04 -04:00
parent 3213715b60
commit fde3d6f870
9 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Core/Addon.php
View file

@ -228,14 +228,15 @@ class Addon
/**
* @brief Calls a single hook.
*
* @param string $name of the hook to call
* @param array $hook Hook data
* @param string|array &$data to transmit to the callback handler
* @param \Friendica\App $a
* @param string $name of the hook to call
* @param array $hook Hook data
* @param string|array &$data to transmit to the callback handler
*/
public static function callSingleHook($a, $name, $hook, &$data = null)
public static function callSingleHook(\Friendica\App $a, $name, $hook, &$data = null)
{
// Don't run a theme's hook if the user isn't using the theme
if (strpos($hook[0], 'view/theme/') !== false && strpos($hook[0], 'view/theme/'.current_theme()) === false) {
if (strpos($hook[0], 'view/theme/') !== false && strpos($hook[0], 'view/theme/' . $a->getCurrentTheme()) === false) {
return;
}

2
src/Core/Theme.php
View file

@ -162,7 +162,7 @@ class Theme
} else {
$parent = 'NOPATH';
}
$theme = current_theme();
$theme = get_app()->getCurrentTheme();
$thname = $theme;
$ext = substr($file, strrpos($file, '.') + 1);
$paths = [