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 25dbe4f182ac3f20eb047789dc5dbbeb74842f5a (commit)
via 83d973b5f744a000c3b3cb33f247db43ef187736 (commit)
from 020ac1f2598496552324710e5413cee181e40ad6 (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 -----------------------------------------------------------------
commit 25dbe4f182ac3f20eb047789dc5dbbeb74842f5a
Merge: 83d973b 020ac1f
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri Jun 27 09:45:00 2014 +0200
Merge branch 'master' of
git+ssh://scm.fusionforge.org//scmrepos/git/fusionforge/fusionforge
commit 83d973b5f744a000c3b3cb33f247db43ef187736
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri Jun 27 09:44:22 2014 +0200
wiki: avoid PHP 5.5 warning about /e
diff --git a/src/plugins/wiki/www/lib/Template.php
b/src/plugins/wiki/www/lib/Template.php
index 25d049a..560f1bc 100644
--- a/src/plugins/wiki/www/lib/Template.php
+++ b/src/plugins/wiki/www/lib/Template.php
@@ -64,7 +64,8 @@ class Template
$orig[] = '/<\?php echo (.*?)\?>/s';
$repl[] = '<?php $this->_print(\1);?>';
- return preg_replace($orig, $repl, $template);
+ // Avoid PHP 5.5 warning about /e
+ return @preg_replace($orig, $repl, $template);
}
private function _mungePlugin($pi)
-----------------------------------------------------------------------
Summary of changes:
src/plugins/wiki/www/lib/Template.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
