[geeklog-cvs] geeklog: Renamed $hay to $haystack for consistency with the PHP ...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/96bdbb425e54
changeset: 7151:96bdbb425e54
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Jun 27 19:14:51 2009 +0200
description:
Renamed $hay to $haystack for consistency with the PHP manual

diffstat:

 system/lib-mbyte.php |  22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diffs (72 lines):

diff -r 948bdd6dc34b -r 96bdbb425e54 system/lib-mbyte.php
--- a/system/lib-mbyte.php	Sat Jun 27 19:14:02 2009 +0200
+++ b/system/lib-mbyte.php	Sat Jun 27 19:14:51 2009 +0200
@@ -143,7 +143,7 @@
     return $result;
 }
 
-function MBYTE_strpos($hay, $needle, $offset = NULL)
+function MBYTE_strpos($haystack, $needle, $offset = NULL)
 {
     static $mb_enabled;
 
@@ -151,15 +151,15 @@
         $mb_enabled = MBYTE_checkEnabled();
     }
     if ($mb_enabled) {
-        $result = mb_strpos($hay, $needle, $offset);
+        $result = mb_strpos($haystack, $needle, $offset);
     } else {
-        $result = strpos($hay, $needle, $offset);
+        $result = strpos($haystack, $needle, $offset);
     }
 
     return $result;
 }
 
-function MBYTE_strrpos($hay, $needle, $offset = NULL)
+function MBYTE_strrpos($haystack, $needle, $offset = NULL)
 {
     static $mb_enabled;
 
@@ -168,15 +168,15 @@
     }
     if ($mb_enabled) {
         if ($offset === NULL) {
-            $result = mb_strrpos($hay, $needle);
+            $result = mb_strrpos($haystack, $needle);
         } else {
-            $result = mb_strrpos($hay, $needle, $offset);
+            $result = mb_strrpos($haystack, $needle, $offset);
         }
     } else {
         if ($offset === NULL) {
-            $result = strrpos($hay, $needle);
+            $result = strrpos($haystack, $needle);
         } else {
-            $result = strrpos($hay, $needle, $offset);
+            $result = strrpos($haystack, $needle, $offset);
         }
     }
 
@@ -233,7 +233,7 @@
 
 /** those are currently not needed in GL, left here if needed later
 
-function MBYTE_substr_count($hay, $needle)
+function MBYTE_substr_count($haystack, $needle)
 {
     static $mb_enabled;
 
@@ -241,9 +241,9 @@
         $mb_enabled = MBYTE_checkEnabled();
     }
     if ($mb_enabled) {
-        $result = mb_substr_count($hay, $needle, 'utf-8');
+        $result = mb_substr_count($haystack, $needle, 'utf-8');
     } else {
-        $result = substr_count($hay, $needle);
+        $result = substr_count($haystack, $needle);
     }
 
     return $result;