Replace error_string calls with calls to the Error class

The old error_string function has been moved to the MantisBT\Error class as a static function.
mantisbt · Feb 25, 2012 · 2cacc8d · 2cacc8d
1 parent b09de30
commit 2cacc8d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/application/services/soap/mc_api.php b/application/services/soap/mc_api.php
@@ -6,6 +6,8 @@
 # change the license of future releases.
 # See docs/ folder for more details
 
+use MantisBT\Error;
+
 # set up error_handler() as the new default error handling function
 set_error_handler( 'mc_error_handler' );
 
@@ -398,11 +400,11 @@ function mc_error_handler( $p_type, $p_error, $p_file, $p_line, $p_context ) {
 			break;
 		case E_USER_ERROR:
 			$t_error_type = "APPLICATION ERROR #$p_error";
-			$t_error_description = error_string( $p_error );
+			$t_error_description = Error::error_string( $p_error );
 			break;
 		case E_USER_WARNING:
 			$t_error_type = "APPLICATION WARNING #$p_error";
-			$t_error_description = error_string( $p_error );
+			$t_error_description = Error::error_string( $p_error );
 			break;
 		case E_USER_NOTICE:
 

diff --git a/public/admin/check/check_api.php b/public/admin/check/check_api.php
@@ -21,6 +21,8 @@
  * @link http://www.mantisbt.org
  */
 
+use MantisBT\Error;
+
 $g_show_all = false;
 $g_show_errors = false;
 
@@ -75,11 +77,11 @@ function check_print_error_rows() {
 				break;
 			case E_USER_ERROR:
 				$t_error_type = 'APPLICATION ERROR #' . $t_error['error'];
-				$t_error_description = htmlentities( error_string( $t_error['error'] ) );
+				$t_error_description = htmlentities( Error::error_string( $t_error['error'] ) );
 				break;
 			case E_USER_WARNING:
 				$t_error_type = 'APPLICATION WARNING #' . $t_error['error'];
-				$t_error_description = htmlentities( error_string( $t_error['error'] ) );
+				$t_error_description = htmlentities( Error::error_string( $t_error['error'] ) );
 				break;
 			case E_USER_NOTICE:
 				# used for debugging

diff --git a/public/print_all_bug_options_reset.php b/public/print_all_bug_options_reset.php
@@ -34,9 +34,8 @@
  * @uses print_api.php
  */
 
-/**
- * MantisBT Core API's
- */
+use MantisBT\Error;
+
 require_once( 'core.php' );
 require_api( 'authentication_api.php' );
 require_api( 'constant_inc.php' );
@@ -88,9 +87,9 @@
 echo '<br /><div>';
 
 if ( $result ) {
-	print lang_get( 'operation_successful' );
+	echo lang_get( 'operation_successful' );
 } else {
-	print error_string( ERROR_GENERIC );
+	echo Error::error_string( ERROR_GENERIC );
 }
 
 echo '<br />';

diff --git a/public/print_all_bug_options_update.php b/public/print_all_bug_options_update.php
@@ -34,9 +34,8 @@
  * @uses print_api.php
  */
 
-/**
- * MantisBT Core API's
- */
+use MantisBT\Error;
+
 require_once( 'core.php' );
 require_api( 'authentication_api.php' );
 require_api( 'constant_inc.php' );
@@ -97,9 +96,9 @@
 echo '<br /><div>';
 
 if ( $result ) {
-	print lang_get( 'operation_successful' );
+	echo lang_get( 'operation_successful' );
 } else {
-	print error_string( ERROR_GENERIC );
+	echo Error::error_string( ERROR_GENERIC );
 }
 
 echo '<br />';