diff options
author | Andrew Manning <tamanning@zoho.com> | 2016-08-19 19:34:04 -0400 |
---|---|---|
committer | Andrew Manning <tamanning@zoho.com> | 2016-08-19 19:34:04 -0400 |
commit | cf93d9c3b42a4ab1dd9c4199b3b0711cc41b2dbb (patch) | |
tree | 3bd937f447fc0a4e57c9e9b4a88074eabf0c1e5d /Zotlabs | |
parent | 40a7d3821098c095a01e2a30b2b49c53bb38e2cf (diff) | |
parent | e4244c0cac301c63e5f69cde24c889e15500d89e (diff) | |
download | volse-hubzilla-cf93d9c3b42a4ab1dd9c4199b3b0711cc41b2dbb.tar.gz volse-hubzilla-cf93d9c3b42a4ab1dd9c4199b3b0711cc41b2dbb.tar.bz2 volse-hubzilla-cf93d9c3b42a4ab1dd9c4199b3b0711cc41b2dbb.zip |
Merge remote-tracking branch 'upstream/dev' into website-export
Diffstat (limited to 'Zotlabs')
-rw-r--r-- | Zotlabs/Module/Settings.php | 2 | ||||
-rw-r--r-- | Zotlabs/Render/Theme.php | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php index 2679b364b..bd16b930e 100644 --- a/Zotlabs/Module/Settings.php +++ b/Zotlabs/Module/Settings.php @@ -1028,7 +1028,7 @@ class Settings extends \Zotlabs\Web\Controller { $theme_config = theme_content($a); } -logger('schemas: ' . print_r($schemas,true)); + // logger('schemas: ' . print_r($schemas,true)); $tpl = get_markup_template("settings_display.tpl"); $o = replace_macros($tpl, array( diff --git a/Zotlabs/Render/Theme.php b/Zotlabs/Render/Theme.php index a732e4fef..62068bc82 100644 --- a/Zotlabs/Render/Theme.php +++ b/Zotlabs/Render/Theme.php @@ -127,5 +127,12 @@ class Theme { return('view/theme/' . $t . '/css/style.css'); } + + function debug() { + logger('system_theme: ' . self::$system_theme); + logger('session_theme: ' . self::$session_theme); + + } + } |