From: Remi Collet <remi@php.net>
Date: Wed, 1 Oct 2014 08:14:14 +0000 (+0200)
Subject: only no_NO.ISO-8859-1 have to be ignored
X-Git-Tag: php-5.6.4RC1~59^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e6f17673338034724c8b637c214b53a51a9db14;p=php

only no_NO.ISO-8859-1 have to be ignored
---

diff --git a/ext/standard/tests/strings/setlocale_variation2.phpt b/ext/standard/tests/strings/setlocale_variation2.phpt
index 10ae22fe0c..5ebdfe8d50 100644
--- a/ext/standard/tests/strings/setlocale_variation2.phpt
+++ b/ext/standard/tests/strings/setlocale_variation2.phpt
@@ -20,9 +20,9 @@ echo "*** Testing setlocale() : usage variations ***\n";
 
 function good_locale($locale) { 
     /**
-    * Note: no_NO is a bogus locale and should not be used, see https://bugzilla.redhat.com/show_bug.cgi?id=532487
+    * Note: no_NO is a bogus locale and should not be used, see https://bugzilla.redhat.com/971416
     **/
-	return $locale !== 'tt_RU@iqtelif.UTF-8' && substr($locale, 0, 5) !== "no_NO";
+	return $locale !== 'tt_RU@iqtelif.UTF-8' && $locale !== 'no_NO.ISO-8859-1';
 }
 
 /* Prototype  : array list_system_locales( void )