Commit:    a3322f8927618a8cadbef4ae2121084b44a564d3
Author:    Stanislav Malyshev <s...@php.net>         Sat, 30 Jun 2012 17:00:25 
-0700
Parents:   eb012cf88440423ff02c46421f29a1c6e850702c 
896ac689c91967dec0601fa9fe048c518da52a3c
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=a3322f8927618a8cadbef4ae2121084b44a564d3

Log:
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed the common misspelling of the word occurred (occured -> occurred)

Changed paths:
  MM  Zend/tests/offset_string.phpt
  MM  Zend/zend_compile.c
  MM  ext/mysqli/mysqli.c
  MM  ext/mysqlnd/mysqlnd_loaddata.c
  MM  ext/pcntl/pcntl.c
  MM  ext/sqlite3/libsqlite/sqlite3.c
  MM  ext/standard/basic_functions.c


Diff:
diff --cc Zend/tests/offset_string.phpt
index 1283501,f7cb81b..c546b37
--- a/Zend/tests/offset_string.phpt
+++ b/Zend/tests/offset_string.phpt
@@@ -27,13 -27,13 +27,13 @@@ var_dump($str[$arr])
  
  echo "Done\n";
  ?>
 ---EXPECTF--
 +--EXPECTF--   
  string(1) "i"
  
- Notice: String offset cast occured in %s on line %d
+ Notice: String offset cast occurred in %s on line %d
  string(1) "S"
  
- Notice: String offset cast occured in %s on line %d
+ Notice: String offset cast occurred in %s on line %d
  string(1) "S"
  
  Warning: Illegal string offset 'run away' in %s on line %d


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to