diff options
| author | marijus <mario@mariovavti.com> | 2014-03-13 19:50:28 +0100 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-03-13 19:50:28 +0100 |
| commit | a8de28cc16df3def8122db4d48b656fc56fce54f (patch) | |
| tree | 77a8c9a5d4bec0ef415503a7ac495d1f36225db6 | |
| parent | b32f8f0ba792bcea4d837444d986e71172097926 (diff) | |
| parent | 5a8be68900250267aa01923f87cf3978c50421e8 (diff) | |
| download | volse-hubzilla-a8de28cc16df3def8122db4d48b656fc56fce54f.tar.gz volse-hubzilla-a8de28cc16df3def8122db4d48b656fc56fce54f.tar.bz2 volse-hubzilla-a8de28cc16df3def8122db4d48b656fc56fce54f.zip | |
Merge branch 'master' of https://github.com/friendica/red
| -rw-r--r-- | mod/help.php | 10 | ||||
| -rw-r--r-- | mod/post.php | 4 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 5 | ||||
| -rw-r--r-- | view/tpl/help.tpl | 3 |
5 files changed, 18 insertions, 6 deletions
diff --git a/mod/help.php b/mod/help.php index aa0ee8ae6..81ecd6ba9 100644 --- a/mod/help.php +++ b/mod/help.php @@ -76,14 +76,18 @@ function help_content(&$a) { $text = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $text); if($doctype === 'html') - return $text; + $content = $text; if($doctype === 'markdown') - return Markdown($text); + $content = Markdown($text); if($doctype === 'bbcode') { require_once('include/bbcode.php'); - return bbcode($text); + $content = bbcode($text); } + return replace_macros(get_markup_template("help.tpl"), array( + '$content' => $content + )); + } diff --git a/mod/post.php b/mod/post.php index 54d0d8db9..95c984b40 100644 --- a/mod/post.php +++ b/mod/post.php @@ -265,7 +265,7 @@ function post_init(&$a) { } else { if($test) { $ret['message'] .= 'auth failure. ' . print_r($_REQUEST,true) . print_r($j,true) . EOL; - json_return_and_dir($ret); + json_return_and_die($ret); } logger('mod_zot: magic-auth failure - not authenticated: ' . $x[0]['xchan_addr']); @@ -281,7 +281,7 @@ function post_init(&$a) { if($test) { $ret['message'] .= 'auth failure fallthrough ' . print_r($_REQUEST,true) . print_r($j,true) . EOL; - json_return_and_dir($ret); + json_return_and_die($ret); } if(strstr($desturl,z_root() . '/rmagic')) diff --git a/version.inc b/version.inc index 81c727eb1..424e69299 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-03-11.613 +2014-03-12.614 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index d30aedd25..3b61ceab1 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -79,6 +79,11 @@ input[type="submit"] { text-decoration: none; } +button, input, optgroup, select, textarea { + color: #000; +} + + pre code { border: none; } diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl new file mode 100644 index 000000000..e01243077 --- /dev/null +++ b/view/tpl/help.tpl @@ -0,0 +1,3 @@ +<div id = "help-content" class="generic-content-wrapper"> +{{$content}} +</div> |