theme server support

darcs-hash:20080716205947-84dde-fa57c8fc140cc479e14b50479df13447abaef31b.gz

1 files changed, 9 insertions, 4 deletions

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