From 1d04cd176bfc8f28cdcbb742d4a6eff6f2842adc Mon Sep 17 00:00:00 2001 From: Gordon Oheim Date: Tue, 14 Feb 2012 18:19:06 +0000 Subject: [PATCH] clarified that the function will return the haystack including the needle, fixes #61085 git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@323216 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/intl/grapheme/grapheme-strstr.xml | 4 ++-- reference/mbstring/functions/mb-strstr.xml | 4 ++-- reference/strings/functions/strstr.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/reference/intl/grapheme/grapheme-strstr.xml b/reference/intl/grapheme/grapheme-strstr.xml index de94750387..54a1694821 100644 --- a/reference/intl/grapheme/grapheme-strstr.xml +++ b/reference/intl/grapheme/grapheme-strstr.xml @@ -15,7 +15,7 @@ boolbefore_needlefalse - Returns part of haystack string from the first occurrence of needle to the end of haystack. + Returns part of haystack string from the first occurrence of needle to the end of haystack (including the needle). @@ -44,7 +44,7 @@ If &true;, grapheme_strstr() returns the part of the - haystack before the first occurrence of the needle. + haystack before the first occurrence of the needle (excluding the needle). diff --git a/reference/mbstring/functions/mb-strstr.xml b/reference/mbstring/functions/mb-strstr.xml index 880505aa50..095c5ae4f5 100644 --- a/reference/mbstring/functions/mb-strstr.xml +++ b/reference/mbstring/functions/mb-strstr.xml @@ -50,9 +50,9 @@ Determines which portion of haystack this function returns. If set to &true;, it returns all of haystack - from the beginning to the first occurrence of needle. + from the beginning to the first occurrence of needle (excluding needle). If set to &false;, it returns all of haystack - from the first occurrence of needle to the end, + from the first occurrence of needle to the end (including needle). diff --git a/reference/strings/functions/strstr.xml b/reference/strings/functions/strstr.xml index 02f5d7559a..31c39d86e4 100644 --- a/reference/strings/functions/strstr.xml +++ b/reference/strings/functions/strstr.xml @@ -15,7 +15,7 @@ boolbefore_needlefalse - Returns part of haystack string from the first + Returns part of haystack string starting from and including the first occurrence of needle to the end of haystack. @@ -61,7 +61,7 @@ If &true;, strstr returns the part of the haystack before the first - occurrence of the needle. + occurrence of the needle (excluding the needle).