X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Fdispy%2Ftheme.php;h=2d423a9280ec5e28547270375d4eb45841da4867;hb=2abbd1dc19680fcfc00c841b6a73a97a297055b9;hp=ee8698cc08ff1b7daf4646c4cd20d832bc9d0e84;hpb=62ea9130feea694d733e6cbde9dec6c1b4a0ef51;p=friendica.git
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index ee8698cc08..2d423a9280 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -2,17 +2,25 @@
/*
* Name: Dispy
- * Description:
Dispy: Light, Spartan, Sleek, and Functional
Dispy Dark: Dark, Spartan, Sleek, and Functional
- * Version: 1.2
+ * Description: Dispy family (light, dark): Sleek and Functional Themes
+ * Version: 1.2.1
* Author: Simon
* Maintainer: Simon
* Screenshot: Screenshot
*/
+/* If you borrow any of these functions, make sure to
+ * RENAME your functions, otherwise both themes get conflicts,
+ * and the friendica instance will get HTTP 500 errors.
+ * To paraphrase Mike: "Might wish to wrap
+ * function_name with "if(! function_exists('function_name')) ... "
+ * or rename to prefix1_function_name (prefix2_function_name), etc.
+ */
+
$a = get_app();
$a->theme_info = array(
'family' => 'dispy',
- 'version' => '1.2'
+ 'version' => '1.2.2'
);
function dispy_init(&$a) {
@@ -165,7 +173,7 @@ EOT;
$a->page['htmlhead'] .= sprintf('', $cssFile);
}
- js_in_foot();
+ _js_in_foot();
}
function dispy_community_info() {
@@ -179,13 +187,15 @@ function dispy_community_info() {
return $a->page['aside_bottom'] = replace_macros($tpl, $aside);
}
-function js_in_foot() {
- /** @purpose insert stuff in bottom of page
- */
- $a = get_app();
- $baseurl = $a->get_baseurl($ssl_state);
- $bottom['$baseurl'] = $baseurl;
- $tpl = file_get_contents(dirname(__file__) . '/bottom.tpl');
+if(! function_exists('_js_in_foot')) {
+ function _js_in_foot() {
+ /** @purpose insert stuff in bottom of page
+ */
+ $a = get_app();
+ $baseurl = $a->get_baseurl($ssl_state);
+ $bottom['$baseurl'] = $baseurl;
+ $tpl = file_get_contents(dirname(__file__) . '/bottom.tpl');
- return $a->page['bottom'] = replace_macros($tpl, $bottom);
+ return $a->page['bottom'] = replace_macros($tpl, $bottom);
+ }
}