|
From: Serendipity C. <s9...@us...> - 2017-04-19 20:33:50
|
Update of /cvsroot/php-blog/additional_plugins/serendipity_event_markdown In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15685/serendipity_event_markdown Modified Files: ChangeLog serendipity_event_markdown.php Log Message: gitclone.sh autocommit Index: serendipity_event_markdown.php =================================================================== RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_markdown/serendipity_event_markdown.php,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- serendipity_event_markdown.php 30 Nov 2014 02:12:41 -0000 1.25 +++ serendipity_event_markdown.php 19 Apr 2017 20:33:47 -0000 1.26 @@ -25,13 +25,13 @@ $propbag->add('name', PLUGIN_EVENT_MARKDOWN_NAME); $propbag->add('description', PLUGIN_EVENT_MARKDOWN_DESC); $propbag->add('stackable', false); - $propbag->add('author', 'Serendipity Team and Jan Lehnardt'); + $propbag->add('author', 'Serendipity Team, Jan Lehnardt and Thomas Hochstein'); $propbag->add('requirements', array( 'serendipity' => '0.7', 'smarty' => '2.6.7', 'php' => '5.3.0' )); - $propbag->add('version', '1.22'); + $propbag->add('version', '1.23'); $propbag->add('cachable_events', array('frontend_display' => true)); $propbag->add('event_hooks', array('frontend_display' => true, 'frontend_comment' => true)); $propbag->add('groups', array('MARKUP')); @@ -134,10 +134,11 @@ $mdsp = $this->get_config('MARKDOWN_SMARTYPANTS'); $mdv = $this->get_config('MARKDOWN_VERSION'); + $mde = serendipity_db_bool($this->get_config('MARKDOWN_EXTRA', false)); switch($mdv) { case 2: - if ($this->get_config('MARKDOWN_EXTRA', false)) { + if ($mde) { require_once dirname(__FILE__) . '/lib/Michelf/MarkdownExtra.inc.php'; } else { require_once dirname(__FILE__) . '/lib/Michelf/Markdown.inc.php'; @@ -151,7 +152,7 @@ break; case 1: - if (serendipity_db_bool($this->get_config('MARKDOWN_EXTRA', false))) { + if ($mde) { include_once dirname(__FILE__) . '/markdown_extra.php'; } else { include_once dirname(__FILE__) . '/markdown.php'; @@ -171,7 +172,11 @@ !isset($serendipity['POST']['properties']['disable_markup_' . $this->instance])) { $element = $temp['element']; if ($mdv == 2) { - $eventData[$element] = str_replace('javascript:', '', Markdown::defaultTransform($eventData[$element])); + if ($mde) { + $eventData[$element] = str_replace('javascript:', '', MarkdownExtra::defaultTransform($eventData[$element])); + } else { + $eventData[$element] = str_replace('javascript:', '', Markdown::defaultTransform($eventData[$element])); + } if ($mdsp == 1) $eventData[$element] = SmartyPants::defaultTransform($eventData[$element]); if ($mdsp == 2) $eventData[$element] = SmartyPantsTypographer::defaultTransform($eventData[$element]); } else { @@ -179,7 +184,7 @@ } } } - $this->setPlaintextBody($eventData, $mdv, $mdsp); + $this->setPlaintextBody($eventData, $mde, $mdv, $mdsp); return true; break; @@ -203,16 +208,24 @@ * @see http://board.s9y.org/viewtopic.php?f=11&t=18351 Discussion of this feature in the S9y forum. * * @param array $eventData + * @param bool $extra Markdown Extra default FALSE * @param int $version Markdown Classic or Lib default 2 * @param int $pants SmartyPants option default 0 */ - function setPlaintextBody(array $eventData, $version=2, $pants=0) + function setPlaintextBody(array $eventData, $extra=FALSE, $version=2, $pants=0) { if (isset($GLOBALS['entry'][0]['plaintext_body'])) { - $html = ($version == 2) ? Markdown::defaultTransform($GLOBALS['entry'][0]['plaintext_body']) : Markdown($GLOBALS['entry'][0]['plaintext_body']); + $plaintext_body = $GLOBALS['entry'][0]['plaintext_body']; } else { - $html = ($version == 2) ? Markdown::defaultTransform(html_entity_decode($eventData['body'], ENT_COMPAT, LANG_CHARSET)) : Markdown(html_entity_decode($eventData['body'], ENT_COMPAT, LANG_CHARSET)); + $plaintext_body = html_entity_decode($eventData['body'], ENT_COMPAT, LANG_CHARSET); } + + if ($mde) { + $html = ($version == 2) ? MarkdownExtra::defaultTransform($plaintext_body) : Markdown($plaintext_body); + } else { + $html = ($version == 2) ? Markdown::defaultTransform($plaintext_body) : Markdown($plaintext_body); + } + if ($pants > 0) $html = ($pants == 2) ? SmartyPantsTypographer::defaultTransform($html) : SmartyPants::defaultTransform($html); $GLOBALS['entry'][0]['plaintext_body'] = trim(strip_tags(str_replace('javascript:', '', $html))); } Index: ChangeLog =================================================================== RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_markdown/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ChangeLog 5 Jan 2014 01:33:45 -0000 1.2 +++ ChangeLog 19 Apr 2017 20:33:47 -0000 1.3 @@ -1,3 +1,18 @@ +Version 1.23: +============= +Changes by Thomas Hochstein <th...@in...> + +- Notice: The "classic" version is no longer supported from Feb 1, 2013 + and stuck at PHP Markdown 1.0.2 / PHP Markdown Extra 1.2.8 +- Upgrade PHP Markdown Lib to 1.7.0 (was 1.4.0). +- Get Markdown Extra working when using the PHP Markdown Lib; + it didn't before. + +Version 1.22: +============= + +- Added parameters to html_entity_decode() and htmlentities(). + Version 1.21: ============= @@ -13,7 +28,6 @@ typographic punctuation HTML entities. - extend to PHP >= 5.3 only (while lib using namespaces) - Version 1.1.5: ============== Changes by Lukas Reindl (ljr_nbg [at] web [dot] de) |
