harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into wiki

Browse Source
This commit is contained in:
Andrew Manning 2016-06-04 15:13:10 -04:00
commit a92241d3cf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Zotlabs/Module/Admin.php
View File

@ -1547,8 +1547,8 @@ class Admin extends \Zotlabs\Web\Controller {
// Toggle theme status // Toggle theme status
toggle_theme($themes, $theme, $result); $this->toggle_theme($themes, $theme, $result);
$s = rebuild_theme_table($themes); $s = $this->rebuild_theme_table($themes);
if($result) if($result)
info( sprintf('Theme %s enabled.', $theme)); info( sprintf('Theme %s enabled.', $theme));
else else
@ -1561,7 +1561,7 @@ class Admin extends \Zotlabs\Web\Controller {
// display theme details // display theme details
require_once('library/markdown.php'); require_once('library/markdown.php');
if (theme_status($themes,$theme)) { if ($this->theme_status($themes,$theme)) {
$status="on"; $action= t("Disable"); $status="on"; $action= t("Disable");
} else { } else {
$status="off"; $action= t("Enable"); $status="off"; $action= t("Enable");