harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
marijus 2014-03-13 19:50:28 +01:00
commit a8de28cc16
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mod/help.php
View File

@ -76,14 +76,18 @@ function help_content(&$a) {
$text = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $text); $text = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $text);
if($doctype === 'html') if($doctype === 'html')
return $text; $content = $text;
if($doctype === 'markdown') if($doctype === 'markdown')
return Markdown($text); $content = Markdown($text);
if($doctype === 'bbcode') { if($doctype === 'bbcode') {
require_once('include/bbcode.php'); require_once('include/bbcode.php');
return bbcode($text); $content = bbcode($text);
} }
return replace_macros(get_markup_template("help.tpl"), array(
'$content' => $content
));
} }

4
mod/post.php
View File

@ -265,7 +265,7 @@ function post_init(&$a) {
} else { } else {
if($test) { if($test) {
$ret['message'] .= 'auth failure. ' . print_r($_REQUEST,true) . print_r($j,true) . EOL; $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']); logger('mod_zot: magic-auth failure - not authenticated: ' . $x[0]['xchan_addr']);
@ -281,7 +281,7 @@ function post_init(&$a) {
if($test) { if($test) {
$ret['message'] .= 'auth failure fallthrough ' . print_r($_REQUEST,true) . print_r($j,true) . EOL; $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')) if(strstr($desturl,z_root() . '/rmagic'))

2
version.inc
View File

@ -1 +1 @@
2014-03-11.613 2014-03-12.614

5
view/theme/redbasic/css/style.css
View File

@ -79,6 +79,11 @@ input[type="submit"] {
text-decoration: none; text-decoration: none;
} }
button, input, optgroup, select, textarea {
color: #000;
}
pre code { pre code {
border: none; border: none;
} }

3
view/tpl/help.tpl Normal file
View File

@ -0,0 +1,3 @@
<div id = "help-content" class="generic-content-wrapper">
{{$content}}
</div>