MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed the last traces of the old Markdown library

Browse source
This commit is contained in:
Michael Vogel 2015-02-23 23:56:44 +01:00
parent 884b8b03db
commit 25eb323d69
1 changed files with 3 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
mod/help.php
View file

@ -1,53 +1,6 @@
<?php <?php
define( 'MARKDOWN_PARSER_CLASS', 'ExtendedMarkdown' );
require_once('library/markdown.php'); require_once('library/markdown.php');
class ExtendedMarkdown extends MarkdownExtra_Parser {
function ExtendedMarkdown() {
$this->block_gamut += array(
"doBlockWarning" => 45,
);
parent::MarkdownExtra_Parser();
}
function doBlockWarning($text) {
$text = preg_replace_callback('/
( # Wrap whole match in $1
(?>
^[ ]*![ ]? # "!" at the start of a line
.+\n # rest of the first line
(.+\n)* # subsequent consecutive lines
\n* # blanks
)+
)
/xm', array(&$this, '_doBlockWarning_callback'), $text);
return $text;
}
function _doBlockWarning_callback($matches) {
$bq = $matches[1];
# trim one level of quoting - trim whitespace-only lines
$bq = preg_replace('/^[ ]*![ ]?|^[ ]+$/m', '', $bq);
$bq = $this->runBlockGamut($bq); # recurse
$bq = preg_replace('/^/m', " ", $bq);
# These leading spaces cause problem with <pre> content,
# so we need to fix that:
// $bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx', array(&$this, '__doBlockWarning_callback2'), $bq);
return "\n" . $this->hashBlock("<div class='md_warning'>\n$bq\n</div>") . "\n\n";
}
function _doBlockWarning_callback2($matches) {
$pre = $matches[1];
$pre = preg_replace('/^ /m', '', $pre);
return $pre;
}
}
if (!function_exists('load_doc_file')) { if (!function_exists('load_doc_file')) {
function load_doc_file($s) { function load_doc_file($s) {
@ -66,8 +19,7 @@ if (!function_exists('load_doc_file')) {
} }
function help_content(&$a) { function help_content(&$a) {
nav_set_selected('help'); nav_set_selected('help');
global $lang; global $lang;
@ -93,9 +45,9 @@ function help_content(&$a) {
'$message' => t('Page not found.') '$message' => t('Page not found.')
)); ));
} }
$html = Markdown($text); $html = Markdown($text);
$html = "<style>.md_warning { padding: 1em; border: #ff0000 solid 2px; background-color: #f9a3a3; color: #ffffff;</style>".$html; $html = "<style>.md_warning { padding: 1em; border: #ff0000 solid 2px; background-color: #f9a3a3; color: #ffffff;</style>".$html;
return $html; return $html;
} }