andrei Tue Apr 10 22:44:57 2007 UTC
Modified files:
/php-src/ext/unicode collator.c
Log:
Wrong locale name.
http://cvs.php.net/viewvc.cgi/php-src/ext/unicode/collator.c?r1=1.12&r2=1.13&diff_format=u
Index: php-src/ext/unicode/collator.c
diff -u php-src/ext/unicode/collator.c:1.12 php-src/ext/unicode/collator.c:1.13
--- php-src/ext/unicode/collator.c:1.12 Mon Jan 1 09:29:33 2007
+++ php-src/ext/unicode/collator.c Tue Apr 10 22:44:57 2007
@@ -14,7 +14,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: collator.c,v 1.12 2007/01/01 09:29:33 sebastian Exp $ */
+/* $Id: collator.c,v 1.13 2007/04/10 22:44:57 andrei Exp $ */
#include "php.h"
#include "ext/standard/php_array.h"
@@ -191,7 +191,7 @@
ucoll = ucol_open(collator_name, &status);
if (U_FAILURE(status)) {
/* UTODO handle error case properly */
- zend_error(E_ERROR, "Could not open collator for locale %s",
UG(default_locale));
+ zend_error(E_ERROR, "Could not open collator for locale %s",
collator_name);
return;
}
collator_set_wrapper(object, zend_collator_create(ucoll) TSRMLS_CC);
@@ -199,7 +199,7 @@
/* }}} */
/* {{{ proto int Collator::compare(string str1, string str2) U
- Compare two strings using collation */
+ Compare two strings using collation }}} */
/* {{{ proto int collator_compare(Collator coll, string str1, string str2) U
Compare two strings using collation */
PHP_FUNCTION(collator_compare)
@@ -218,7 +218,7 @@
/* }}} */
/* {{{ proto array Collator::sort(array input) U
- Sort an array using collation */
+ Sort an array using collation }}} */
/* {{{ proto array collator_sort(Collator coll, array input) U
Sort an array using collation */
PHP_FUNCTION(collator_sort)
@@ -248,7 +248,7 @@
/* }}} */
/* {{{ proto void Collator::setStrength(int strength) U
- Set the collation strength */
+ Set the collation strength }}} */
/* {{{ proto void collator_set_strength(Collator coll, int strength) U
Set the collation strength */
PHP_FUNCTION(collator_set_strength)
@@ -266,7 +266,7 @@
/* }}} */
/* {{{ proto int Collator::getStrength() U
- Returns the current collation strength */
+ Returns the current collation strength }}} */
/* {{{ proto int collator_get_strength(Collator coll) U
Returns the current collation strength */
PHP_FUNCTION(collator_get_strength)
@@ -283,7 +283,7 @@
/* }}} */
/* {{{ proto bool Collator::setAttribute(int attribute, int value) U
- Set a collation attribute */
+ Set a collation attribute }}} */
/* {{{ proto bool collator_set_attribute(Collator coll, int attribute, int
value) U
Set a collation attribute */
PHP_FUNCTION(collator_set_attribute)
@@ -305,7 +305,7 @@
/* {{{ proto int Collator::getAttribute(int attribute) U
- Returns a collation attribute */
+ Returns a collation attribute }}} */
/* {{{ proto int collator_get_attribute(Collator coll, int attribute) U
Returns a collation attribute */
PHP_FUNCTION(collator_get_attribute)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
