Merge branch 'master' of https://github.com/friendica/friendica

Conflicts:
	include/config.php
	update.php

1 files changed, 16 insertions, 0 deletions

diff --git a/mod/pretheme.php b/mod/pretheme.php
new file mode 100644
index 000000000..0efa587d8
--- /dev/null
+++ b/mod/pretheme.php
@@ -0,0 +1,16 @@
+<?php
+
+function pretheme_init(&$a) {
+	
+	if($_REQUEST['theme']) {
+		$theme = $_REQUEST['theme'];
+		$info = get_theme_info($theme);
+		if($info) {
+			// unfortunately there will be no translation for this string
+			$desc = $info['description'] . ' ' . $info['version'];
+		}
+		else $desc = '';
+		echo json_encode(array('img' => get_theme_screenshot($theme), 'desc' => $desc));
+	}
+	killme();
+}