tony2001 Fri Jul 28 12:23:18 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/standard string.c
Log:
MFH: patch for #37846 (wordwrap() wraps incorrectly)
by Dmitry Kononov <ddk at krasn dot ru>
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.159&r2=1.2027.2.547.2.160&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.159 php-src/NEWS:1.2027.2.547.2.160
--- php-src/NEWS:1.2027.2.547.2.159 Thu Jul 27 18:14:55 2006
+++ php-src/NEWS Fri Jul 28 12:23:18 2006
@@ -36,6 +36,7 @@
names). (Ilia)
- Fixed bug #38047 ("file" and "line" sometimes not set in backtrace from
inside error handler). (Dmitry)
+- Fixed bug #37846 (wordwrap() wraps incorrectly). (ddk at krasn dot ru, Tony)
- Fixed bug #37564 (AES privacy encryption not possible due to net-snmp 5.2
compatibility issue). (Jani, patch by scott dot moynes+php at gmail dot com)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.8&r2=1.445.2.14.2.9&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.8
php-src/ext/standard/string.c:1.445.2.14.2.9
--- php-src/ext/standard/string.c:1.445.2.14.2.8 Mon Jul 17 20:36:46 2006
+++ php-src/ext/standard/string.c Fri Jul 28 12:23:18 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.445.2.14.2.8 2006/07/17 20:36:46 mike Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.9 2006/07/28 12:23:18 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -669,7 +669,7 @@
lastspace = current;
} else if (current - laststart >= linelength &&
laststart != lastspace) {
newtext[lastspace] = breakchar[0];
- laststart = lastspace;
+ laststart = lastspace + 1;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
