From 7653b91a1f65f902e19fdb0b31aa1d261a87e523 Mon Sep 17 00:00:00 2001
From: Peter Cowburn <salathe@php.net>
Date: Tue, 18 May 2010 20:49:29 +0000
Subject: [PATCH] smush another pesky PHP 6

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@299468 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/array/functions/sort.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/reference/array/functions/sort.xml b/reference/array/functions/sort.xml
index 5bf810d997..2c640c23e7 100644
--- a/reference/array/functions/sort.xml
+++ b/reference/array/functions/sort.xml
@@ -51,10 +51,13 @@
         </listitem>
         <listitem>
          <simpara><constant>SORT_LOCALE_STRING</constant> - compare items as
-          strings, based on the current locale. Added in PHP 4.4.0 and 5.0.2.
+          strings, based on the current locale. Added in PHP 4.4.0 and 5.0.2, it
+          uses the system locale, which can be changed using <function>setlocale</function>.
+          <!-- FIXME PHP_6
           Before PHP 6, it uses the system locale, which can be changed using
           <function>setlocale</function>. Since PHP 6, you must use the
           <function>i18n_loc_set_default</function> function.
+          -->
          </simpara>
         </listitem>
        </itemizedlist>