From: Seiji Masugata <masugata@php.net>
Date: Thu, 21 Dec 2006 17:28:57 +0000 (+0000)
Subject: Fixed bug #39361, #39400 (mbstring function overloading problem).
X-Git-Tag: php-4.4.5RC1~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3c17c2fb2206e059a71b5d7c546e0ed5ccdd9a8;p=php

Fixed bug #39361, #39400 (mbstring function overloading problem).
---

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 31cf1f1dd9..68f7de9cec 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -2197,11 +2197,11 @@ PHP_FUNCTION(mb_strpos)
 	convert_to_string_ex(arg2);
 
 	if (offset < 0 || offset > Z_STRLEN_PP(arg1)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset is out of range");
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string.");
 		RETURN_FALSE;
 	}
 	if (Z_STRLEN_PP(arg2) == 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty needle");
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter.");
 		RETURN_FALSE;
 	}
 	haystack.val = (unsigned char *)Z_STRVAL_PP(arg1);
@@ -2272,11 +2272,9 @@ PHP_FUNCTION(mb_strrpos)
 	convert_to_string_ex(arg1);
 	convert_to_string_ex(arg2);
 	if (Z_STRLEN_PP(arg1) <= 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty haystack");
 		RETURN_FALSE;
 	}
 	if (Z_STRLEN_PP(arg2) <= 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,"Empty needle");
 		RETURN_FALSE;
 	}
 	haystack.val = (unsigned char *)Z_STRVAL_PP(arg1);
@@ -2331,7 +2329,7 @@ PHP_FUNCTION(mb_substr_count)
 	convert_to_string_ex(arg2);
 
 	if (Z_STRLEN_PP(arg2) <= 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,"Empty needle");
+		php_error_docref(NULL TSRMLS_CC, E_WARNING,"Empty substring.");
 		RETURN_FALSE;
 	}
 	haystack.val = (unsigned char *)Z_STRVAL_PP(arg1);