diff options
| -rw-r--r-- | lib/common.php | 2 | ||||
| -rw-r--r-- | lib/theme.php | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/lib/common.php b/lib/common.php index 14fb2093f..dca1ae94f 100644 --- a/lib/common.php +++ b/lib/common.php @@ -62,6 +62,8 @@ $config = array('blacklist' => array()), 'avatar' => array('server' => NULL), + 'theme' => + array('server' => NULL), 'xmpp' => array('enabled' => false, 'server' => 'INVALID SERVER', diff --git a/lib/theme.php b/lib/theme.php index d1e82596e..80982aa82 100644 --- a/lib/theme.php +++ b/lib/theme.php @@ -20,11 +20,16 @@ if (!defined('LACONICA')) { exit(1); } function theme_file($relative) { - global $config; - return INSTALLDIR.'/theme/'.$config['site']['theme'].'/'.$relative; + $theme = common_config('site', 'theme'); + return INSTALLDIR.'/theme/'.$theme.'/'.$relative; } function theme_path($relative) { - global $config; - return common_path('theme/'.$config['site']['theme'].'/'.$relative); + $theme = common_config('site', 'theme'); + $server = common_config('theme', 'server'); + if ($server) { + return 'http://'.$server.'/'.$theme.'/'.$relative; + } else { + return common_path('theme/'.$theme.'/'.$relative); + } }
\ No newline at end of file |