Minor performance enhancements in string processing

Issue #24823
mantisbt · Oct 5, 2018 · 6a29d98 · 6a29d98
1 parent bd7bfd3
commit 6a29d98
Showing 1 changed file with 7 additions and 14 deletions.
diff --git a/core/string_api.php b/core/string_api.php
@@ -112,9 +112,9 @@ function string_no_break( $p_string ) {
  * @return string
  */
 function string_nl2br( $p_string, $p_wrap = 100 ) {
-	$t_output = '';
 	$t_pieces = preg_split( '/(<pre[^>]*>.*?<\/pre>)/is', $p_string, -1, PREG_SPLIT_DELIM_CAPTURE );
 	if( isset( $t_pieces[1] ) ) {
+		$t_output = '';
 		foreach( $t_pieces as $t_piece ) {
 			if( preg_match( '/(<pre[^>]*>.*?<\/pre>)/is', $t_piece ) ) {
 				$t_piece = preg_replace( '/<br[^>]*?>/', '', $t_piece );
@@ -144,8 +144,7 @@ function string_nl2br( $p_string, $p_wrap = 100 ) {
  * @return string
  */
 function string_display( $p_string ) {
-	$t_data = event_signal( 'EVENT_DISPLAY_TEXT', $p_string, true );
-	return $t_data;
+	return event_signal( 'EVENT_DISPLAY_TEXT', $p_string, true );
 }
 
 /**
@@ -154,8 +153,7 @@ function string_display( $p_string ) {
  * @return string
  */
 function string_display_line( $p_string ) {
-	$t_data = event_signal( 'EVENT_DISPLAY_TEXT', $p_string, false );
-	return $t_data;
+	return event_signal( 'EVENT_DISPLAY_TEXT', $p_string, false );
 }
 
 /**
@@ -165,8 +163,7 @@ function string_display_line( $p_string ) {
  * @return string
  */
 function string_display_links( $p_string ) {
-	$t_data = event_signal( 'EVENT_DISPLAY_FORMATTED', $p_string, true );
-	return $t_data;
+	return event_signal( 'EVENT_DISPLAY_FORMATTED', $p_string, true );
 }
 
 /**
@@ -176,8 +173,7 @@ function string_display_links( $p_string ) {
  * @return string
  */
 function string_display_line_links( $p_string ) {
-	$t_data = event_signal( 'EVENT_DISPLAY_FORMATTED', $p_string, false );
-	return $t_data;
+	return event_signal( 'EVENT_DISPLAY_FORMATTED', $p_string, false );
 }
 
 /**
@@ -615,9 +611,7 @@ function string_restore_valid_html_tags( $p_string, $p_multiline = true ) {
 
 	$p_string = preg_replace( '/&lt;(' . $t_tags . ')\s*&gt;/ui', '<\\1>', $p_string );
 	$p_string = preg_replace( '/&lt;\/(' . $t_tags . ')\s*&gt;/ui', '</\\1>', $p_string );
-	$p_string = preg_replace( '/&lt;(' . $t_tags . ')\s*\/&gt;/ui', '<\\1 />', $p_string );
-
-	return $p_string;
+	return preg_replace( '/&lt;(' . $t_tags . ')\s*\/&gt;/ui', '<\\1 />', $p_string );
 }
 
 /**
@@ -801,8 +795,7 @@ function string_get_bug_report_url() {
  * @return string
  */
 function string_get_confirm_hash_url( $p_user_id, $p_confirm_hash ) {
-	$t_path = config_get_global( 'path' );
-	return $t_path . 'verify.php?id=' . string_url( $p_user_id ) . '&confirm_hash=' . string_url( $p_confirm_hash );
+	return config_get_global( 'path' ) . 'verify.php?id=' . string_url( $p_user_id ) . '&confirm_hash=' . string_url( $p_confirm_hash );
 }
 
 /**