X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Ftheme.php;h=80982aa82b0d59f7742fd2d128dceccbbb60881b;hb=bb366ab0b881f4e5c8534b5d1542fd550918f58a;hp=d1e82596edc28fa6079c35109e7c5ca5a116345f;hpb=dd0b341b643d68d92c4b23fc8188e16110c3c1ab;p=quix0rs-gnu-social.git diff --git a/lib/theme.php b/lib/theme.php index d1e82596ed..80982aa82b 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