[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1347-g343cab8

Franck Villaume nerville at libremir.placard.fr.eu.org
Mon Jan 16 23:24:27 CET 2017


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  343cab8166e2ffe89df41d8aa47842f24f2a48d1 (commit)
      from  cf094976f1ad3dc836579416afbdb472913f2705 (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=343cab8166e2ffe89df41d8aa47842f24f2a48d1

commit 343cab8166e2ffe89df41d8aa47842f24f2a48d1
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Jan 16 23:24:10 2017 +0100

    fix PHP deprecated /e in preg_replace

diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index 7583c89..bf55fd6 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -1298,11 +1298,10 @@ function debug_string_backtrace() {
 
 	// Remove first item from backtrace as it's this function
 	// which is redundant.
-	$trace = preg_replace('/^#0\s+'.__FUNCTION__."[^\n]*\n/", '',
-		$trace, 1);
+	$trace = preg_replace('/^#0\s+'.__FUNCTION__."[^\n]*\n/", '', $trace, 1);
 
 	// Renumber backtrace items.
-	$trace = preg_replace('/^#(\d+)/me', '\'#\' . ($1 - 1)', $trace);
+	$trace = preg_replace_callback('/^#(\d+)/m', function($m) { return '#' . (ltrim($m[0], '#') - 1); }, $trace);
 
 	return $trace;
 }

-----------------------------------------------------------------------

Summary of changes:
 src/common/include/utils.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list