Merge branch '0.7.x' into 0.8.x

[quix0rs-gnu-social.git] / lib / theme.php

diff --git a/lib/theme.php b/lib/theme.php
index 95030affed66a424de6f529c4bcdcf92990f3cfd..bef660cbf538183dc6ac14e8ad0b77eee9415f07 100644 (file)
--- a/lib/theme.php
+++ b/lib/theme.php
@@ -69,4 +69,31 @@ function theme_path($relative, $theme=null)
     } else {
         return common_path('theme/'.$theme.'/'.$relative);
     }
-}
\ No newline at end of file
+}
+
+/**
+ * Gets the full URL of a file in a skin dir based on its relative name
+ *
+ * @param string $relative relative path within the theme, skin directory
+ * @param string $theme    name of the theme; defaults to current theme
+ * @param string $skin    name of the skin; defaults to current theme
+ *
+ * @return string URL of the file
+ */
+
+function skin_path($relative, $theme=null, $skin=null)
+{
+    if (!$theme) {
+        $theme = common_config('site', 'theme');
+    }
+    if (!$skin) {
+        $skin = common_config('site', 'skin');
+    }
+    $server = common_config('theme', 'server');
+    if ($server) {
+        return 'http://'.$server.'/'.$theme.'/skin/'.$skin.'/'.$relative;
+    } else {
+        return common_path('theme/'.$theme.'/skin/'.$skin.'/'.$relative);
+    }
+}
+