cvs: pear /HTML_Template_Flexy/Flexy/Compiler Flexy.php
[email protected] ("Alan Knowles")
| Newsgroups | php.pear.cvs |
|---|---|
| Message-ID | <cvsalan_k1209436565@cvsserver> |
alan_k Tue Apr 29 02:36:05 2008 UTC
Modified files:
/pear/HTML_Template_Flexy/Flexy/Compiler Flexy.php
Log:
fix bug #13419 - switch to using LC_ALL for setlocale (as LC_MESSAGES did not make sense, and was missing on some platforms
http://cvs.php.net/viewvc.cgi/pear/HTML_Template_Flexy/Flexy/Compiler/Flexy.php?r1=1.23&r2=1.24&diff_format=u
Index: pear/HTML_Template_Flexy/Flexy/Compiler/Flexy.php
diff -u pear/HTML_Template_Flexy/Flexy/Compiler/Flexy.php:1.23 pear/HTML_Template_Flexy/Flexy/Compiler/Flexy.php:1.24
--- pear/HTML_Template_Flexy/Flexy/Compiler/Flexy.php:1.23 Thu Oct 18 03:33:14 2007
+++ pear/HTML_Template_Flexy/Flexy/Compiler/Flexy.php Tue Apr 29 02:36:05 2008
@@ -16,7 +16,7 @@
// | Authors: Alan Knowles <[email protected]> |
// +----------------------------------------------------------------------+
//
-// $Id: Flexy.php,v 1.23 2007/10/18 03:33:14 alan_k Exp $
+// $Id: Flexy.php,v 1.24 2008/04/29 02:36:05 alan_k Exp $
//
// Base Compiler Class
// Standard 'Original Flavour' Flexy compiler
@@ -127,7 +127,7 @@
// technically we shouldnt get here as we dont cache errors..
if (is_a($res, 'PEAR_Error')) {
return $res;
- }
+ }
// turn tokens into Template..
@@ -254,8 +254,9 @@
//echo $n;
}
$this->options['Translation2']->setPageID($n);
- } else {
- setlocale(LC_MESSAGES, $this->options['locale']);
+ } elseif (defined('LC_ALL')) {
+ // not sure what we should really use here... - used to be LC_MESSAGES.. but that did not make sense...
+ setlocale(LC_ALL, $this->options['locale']);
}
}