From: Jon Parise <jon@php.net>
Date: Thu, 27 Jul 2000 16:43:38 +0000 (+0000)
Subject: Reworded some of the php_error messages for grammar and clarity.
X-Git-Tag: PRE_FILE_COMPILE_API_CHANGE~105
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=021ad113ef951795d1427b257786603e27b9593d;p=php

Reworded some of the php_error messages for grammar and clarity.
(For example, settled on "cannot" instead of "can't" in all case)
---

diff --git a/ext/session/session.c b/ext/session/session.c
index 1c9be84858..a2d12294e5 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -76,7 +76,7 @@ static PHP_INI_MH(OnUpdateSaveHandler)
 	
 	PS(mod) = _php_find_ps_module(new_value PSLS_CC);
 	if(!PS(mod)) {
-	  php_error(E_ERROR,"Can't find save handler %s",new_value);
+	  php_error(E_ERROR,"Cannot find save handler %s",new_value);
 	}
 	return SUCCESS;
 }
@@ -88,7 +88,7 @@ static PHP_INI_MH(OnUpdateSerializer)
 
 	PS(serializer) = _php_find_ps_serializer(new_value PSLS_CC);
 	if(!PS(serializer)) {
-	  php_error(E_ERROR,"Can't find serializer handler %s",new_value);
+	  php_error(E_ERROR,"Cannot find serialization handler %s",new_value);
 	}	  
 	return SUCCESS;
 }
@@ -416,7 +416,7 @@ static void _php_session_decode(const char *val, int vallen PSLS_DC)
 		php_session_track_init();
 	if (PS(serializer)->decode(val, vallen PSLS_CC) == FAILURE) {
 		_php_session_destroy(PSLS_C);
-		php_error(E_WARNING, "Failed to decode session object. Session has been destroyed now.");
+		php_error(E_WARNING, "Failed to decode session object. Session has been destroyed.");
 	}
 }
 
@@ -747,12 +747,12 @@ static void _php_session_start(PSLS_D)
 	track_vars = INI_BOOL("track_vars");
 
 	if (!register_globals && !track_vars) {
-		php_error(E_ERROR, "The session module will not work, if you have disabled track_vars and register_globals. Enable at least one of them.");
+		php_error(E_ERROR, "The session module will not work if you have disabled track_vars and register_globals. At least one of them must be enabled.");
 		return;
 	}
 
 	if (!track_vars && PS(use_cookies))
-		php_error(E_NOTICE, "Because track_vars are disabled, the session module will not be able to determine whether the user has sent a cookie. SID will always be defined.");
+		php_error(E_NOTICE, "Because track_vars is disabled, the session module will not be able to determine whether the user has sent a cookie. SID will always be defined.");
 	
 	/*
 	 * If our only resource is the global symbol_table, then check it.
@@ -888,7 +888,7 @@ static zend_bool _php_session_destroy(PSLS_D)
 
 	if (PS(mod)->destroy(&PS(mod_data), PS(id)) == FAILURE) {
 		retval = FAILURE;
-		php_error(E_WARNING, "Destroying the session object failed");
+		php_error(E_WARNING, "Session object destruction failed");
 	}
 	
 	php_rshutdown_session_globals(PSLS_C);