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 d58413878b5190e48104e04b121a04afe7e58d49 (commit)
from 1572affdf212eda3c65ee83cbd19a2d9fc83f4c7 (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=d58413878b5190e48104e04b121a04afe7e58d49
commit d58413878b5190e48104e04b121a04afe7e58d49
Author: Franck Villaume <[email protected]>
Date: Sat Apr 17 10:44:01 2021 +0200
Finalize merge 6.1
diff --git a/src/common/include/utils_crossref.php
b/src/common/include/utils_crossref.php
index 7e51438..9af355b 100644
--- a/src/common/include/utils_crossref.php
+++ b/src/common/include/utils_crossref.php
@@ -42,11 +42,7 @@ function util_gen_cross_ref($text, $group_id = 0) {
$text = preg_replace_callback('/\[\#(\d+)\]/', function($matches)
{return _artifactid2url($matches[1]);}, $text);
// Handle FusionForge [Tnnn] Syntax => links to task.
-<<<<<<< HEAD
- $text = preg_replace_callback('/\[\T(\d+)\]/', function($matches)
{return _taskid2url($matches[1],'.$group_id.');}, $text);
-=======
- $text = preg_replace_callback('/\[T(\d+)\]/',
create_function('$matches', 'return _taskid2url($matches[1],'.$group_id.');'),
$text);
->>>>>>> 6.1
+ $text = preg_replace_callback('/\[T(\d+)\]/', function($matches)
{return _taskid2url($matches[1],'.$group_id.');}, $text);
// Handle [wiki:<pagename>] syntax
$text = preg_replace_callback('/\[wiki:(.*?)\]/', function($matches)
{return _page2url('.$group_id.',$matches[1]);}, $text);
-----------------------------------------------------------------------
Summary of changes:
src/common/include/utils_crossref.php | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
