sekretaerbaer/friendica-addons-sekb
1
0
Fork 0
forked from Friendica/friendica-addons
Code Pull requests Activity

Merge pull request #595 from MrPetovan/bug/4946-move-current-theme-to-app

Browse source 
Replace current_theme() and current_theme_url() calls
This commit is contained in:
Michael Vogel 2018-04-29 19:11:56 +02:00 committed by GitHub
commit 8aef232935
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
membersince/membersince.php
View file

@ -21,9 +21,9 @@ function membersince_uninstall()
Addon::unregisterHook('profile_advanced', 'addon/membersince/membersince.php', 'membersince_display'); Addon::unregisterHook('profile_advanced', 'addon/membersince/membersince.php', 'membersince_display');
} }
function membersince_display(&$a, &$b) function membersince_display(Friendica\App $a, &$b)
{ {
if (current_theme() == 'frio') { if ($a->getCurrentTheme() == 'frio') {
// Works in Frio. // Works in Frio.
$doc = new DOMDocument(); $doc = new DOMDocument();
$doc->loadHTML(mb_convert_encoding($b, 'HTML-ENTITIES', 'UTF-8')); $doc->loadHTML(mb_convert_encoding($b, 'HTML-ENTITIES', 'UTF-8'));

8
smileybutton/smileybutton.php
View file

@ -24,10 +24,10 @@ function smileybutton_uninstall() {
function show_button($a, &$b) { function show_button(Friendica\App $a, &$b) {
// Disable if theme is quattro // Disable if theme is quattro
// TODO add style for quattro // TODO add style for quattro
if (current_theme() == 'quattro') if ($a->getCurrentTheme() == 'quattro')
return; return;
// Disable for mobile because most mobiles have a smiley key for ther own // Disable for mobile because most mobiles have a smiley key for ther own
@ -112,7 +112,7 @@ function show_button($a, &$b) {
$s .= "\t</tr></table>"; $s .= "\t</tr></table>";
//Add css to header //Add css to header
$css_file = 'addon/smileybutton/view/'.current_theme().'.css'; $css_file = 'addon/smileybutton/view/' . $a->getCurrentTheme() . '.css';
if (! file_exists($css_file)) if (! file_exists($css_file))
$css_file = 'addon/smileybutton/view/default.css'; $css_file = 'addon/smileybutton/view/default.css';
$css_url = $a->get_baseurl().'/'.$css_file; $css_url = $a->get_baseurl().'/'.$css_file;
@ -121,7 +121,7 @@ function show_button($a, &$b) {
//Get the correct image for the theme //Get the correct image for the theme
$image = 'addon/smileybutton/view/'.current_theme().'.png'; $image = 'addon/smileybutton/view/' . $a->getCurrentTheme() . '.png';
if (! file_exists($image)) if (! file_exists($image))
$image = 'addon/smileybutton/view/default.png'; $image = 'addon/smileybutton/view/default.png';
$image_url = $a->get_baseurl().'/'.$image; $image_url = $a->get_baseurl().'/'.$image;