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 1572affdf212eda3c65ee83cbd19a2d9fc83f4c7 (commit)
via b8cd741dc090f4249a0a16971e2c73ca2db67846 (commit)
from d3235e423c5a17052311920b619b73128b1e2354 (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=1572affdf212eda3c65ee83cbd19a2d9fc83f4c7
commit 1572affdf212eda3c65ee83cbd19a2d9fc83f4c7
Merge: d3235e4 b8cd741
Author: Franck Villaume <[email protected]>
Date: Sat Apr 17 10:36:03 2021 +0200
Merge 6.1
diff --cc src/common/include/utils_crossref.php
index 8fc63dc,8aca3f4..7e51438
--- a/src/common/include/utils_crossref.php
+++ b/src/common/include/utils_crossref.php
@@@ -4,7 -4,7 +4,7 @@@
*
* Copyright 1999-2001 (c) Alcatel-Lucent
* Copyright 2009, Roland Mas
- * Copyright 2014-2016,2019, Franck Villaume - TrivialDev
- * Copyright 2014-2016,2021, Franck Villaume - TrivialDev
++ * Copyright 2014-2016,2019,2021, Franck Villaume - TrivialDev
*
* This file is part of FusionForge. FusionForge is free software;
* you can redistribute it and/or modify it under the terms of the
@@@ -39,28 -39,22 +39,32 @@@ function util_gen_cross_ref($text, $gro
$text = util_make_links($text);
// Handle FusionForge [#nnn] Syntax => links to tracker.
- $text = preg_replace_callback('/\[\#(\d+)\]/',
create_function('$matches', 'return _artifactid2url($matches[1]);'), $text);
+ $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
// Handle [wiki:<pagename>] syntax
- $text = preg_replace_callback('/\[wiki:(.*?)\]/',
create_function('$matches', 'return _page2url('.$group_id.',$matches[1]);'),
$text);
+ $text = preg_replace_callback('/\[wiki:(.*?)\]/', function($matches)
{return _page2url('.$group_id.',$matches[1]);}, $text);
// Handle FusionForge [forum:<thread_id>] Syntax => links to forum.
- $text = preg_replace_callback('/\[forum:(\d+)\]/',
create_function('$matches', 'return _forumid2url($matches[1]);'), $text);
+ $text = preg_replace_callback('/\[forum:(\d+)\]/', function($matches)
{return _forumid2url($matches[1]);}, $text);
// Handle FusionForge [Dnnn] Syntax => links to document.
- $text = preg_replace_callback('/\[D(\d+)\]/',
create_function('$matches', 'return
_documentid2url($matches[1],'.$group_id.');'), $text);
+ $text = preg_replace_callback('/\[D(\d+)\]/', function($matches)
{return _documentid2url($matches[1]);}, $text);
// Handle FusionForge [Rnnn] Syntax => links to frs release.
- $text = preg_replace_callback('/\[R(\d+)\]/',
create_function('$matches', 'return _frsreleaseid2url($matches[1]);'), $text);
+ $text = preg_replace_callback('/\[R(\d+)\]/', function($matches)
{return _frsreleaseid2url($matches[1]);}, $text);
+
+ // Handle FusionForge [Nnnn] Syntax => links to diary notes.
+ $text = preg_replace_callback('/\[N(\d+)\]/', function($matches)
{return _diarynotesid2url($matches[1]);}, $text);
+
+ // Handle FusionForge [Pnnn] Syntax => links to project.
+ $text = preg_replace_callback('/\[P(\d+)\]/', function($matches)
{return _projectid2url($matches[1]);}, $text);
return $text;
}
-----------------------------------------------------------------------
Summary of changes:
src/common/include/utils_crossref.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
