This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 0e7f7f879230e886d41a7f4e13bddd04c2372d2e (commit)
from 4eb1da216f2120ea3804a01d8a17a43f1b6afaed (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=0e7f7f879230e886d41a7f4e13bddd04c2372d2e
commit 0e7f7f879230e886d41a7f4e13bddd04c2372d2e
Author: Franck Villaume <[email protected]>
Date: Tue Aug 15 11:10:48 2017 +0200
use classic Markdown to support debian
diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index 54999f4..f946c63 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -37,6 +37,7 @@ if [ -e /etc/debian_version ]; then
cvs subversion viewvc python-pycurl git mercurial xinetd \
python-moinmoin libapache2-mod-wsgi python-psycopg2 \
unoconv poppler-utils dpkg-dev \
+ libmarkdown-php \
vsftpd \
fonts-dejavu-core
apt-get -y install mediawiki -t jessie-backports
diff --git a/src/common/tracker/include/ArtifactHtml.class.php
b/src/common/tracker/include/ArtifactHtml.class.php
index bf513e0..f2bf4db 100644
--- a/src/common/tracker/include/ArtifactHtml.class.php
+++ b/src/common/tracker/include/ArtifactHtml.class.php
@@ -45,8 +45,8 @@ class ArtifactHtml extends Artifact {
$parsertype = forge_get_config('tracker_parser_type');
switch ($parsertype) {
case 'markdown':
- require_once 'Michelf/Markdown.inc.php';
- $result_html =
\Michelf\Markdown::defaultTransform($result_html);
+ require_once 'markdown.php';
+ $result_html = Markdown($result_html);
break;
default:
$result_html = nl2br($result_html);
diff --git a/src/plugins/blocks/common/blocksPlugin.class.php
b/src/plugins/blocks/common/blocksPlugin.class.php
index c06c83d..963b428 100644
--- a/src/plugins/blocks/common/blocksPlugin.class.php
+++ b/src/plugins/blocks/common/blocksPlugin.class.php
@@ -130,8 +130,8 @@ control over it to the project's administrator.");
$parsertype = forge_get_config('parser_type', 'blocks');
switch ($parsertype) {
case 'markdown':
- require_once 'Michelf/Markdown.inc.php';
- $text =
\Michelf\Markdown::defaultTransform($text);
+ require_once 'markdown.php';
+ $text = Markdown($text);
break;
default:
$text = preg_replace_callback('/<p>{boxTop
(.*?)}<\/p>/i', function($m) { global $HTML; return $HTML->boxTop($m[1]); },
$text);
-----------------------------------------------------------------------
Summary of changes:
autoinstall/install-src.sh | 1 +
src/common/tracker/include/ArtifactHtml.class.php | 4 ++--
src/plugins/blocks/common/blocksPlugin.class.php | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
