theme server support

darcs-hash:20080716205947-84dde-fa57c8fc140cc479e14b50479df13447abaef31b.gz
This commit is contained in:
Evan Prodromou 2008-07-16 16:59:47 -04:00
parent 0b1528382b
commit 4798cd3126
2 changed files with 11 additions and 4 deletions

View File

@ -62,6 +62,8 @@ $config =
array('blacklist' => array()), array('blacklist' => array()),
'avatar' => 'avatar' =>
array('server' => NULL), array('server' => NULL),
'theme' =>
array('server' => NULL),
'xmpp' => 'xmpp' =>
array('enabled' => false, array('enabled' => false,
'server' => 'INVALID SERVER', 'server' => 'INVALID SERVER',

View File

@ -20,11 +20,16 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
function theme_file($relative) { function theme_file($relative) {
global $config; $theme = common_config('site', 'theme');
return INSTALLDIR.'/theme/'.$config['site']['theme'].'/'.$relative; return INSTALLDIR.'/theme/'.$theme.'/'.$relative;
} }
function theme_path($relative) { function theme_path($relative) {
global $config; $theme = common_config('site', 'theme');
return common_path('theme/'.$config['site']['theme'].'/'.$relative); $server = common_config('theme', 'server');
if ($server) {
return 'http://'.$server.'/'.$theme.'/'.$relative;
} else {
return common_path('theme/'.$theme.'/'.$relative);
}
} }