[phpwiki-checkins] CVS: phpwiki/lib config.php,1.24.2.7,1.24.2.8

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv31436/lib

Modified Files:
      Tag: release-1_2-branch
	config.php 
Log Message:
Fix SF bug #424811: putenv(LANG) fails when safe_mode is on.


Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.24.2.7
retrieving revision 1.24.2.8
diff -C2 -r1.24.2.7 -r1.24.2.8
*** config.php	2001/11/09 03:13:00	1.24.2.7
--- config.php	2001/11/09 15:36:03	1.24.2.8
***************
*** 221,225 ****
        }
     } else {
!       putenv ("LANG=$LANG");
        bindtextdomain ("phpwiki", "./locale");
        textdomain ("phpwiki");
--- 221,227 ----
        }
     } else {
!       // This putenv() fails when safe_mode is on.
!       // I think it is unnecessary. 
!       //putenv ("LANG=$LANG");
        bindtextdomain ("phpwiki", "./locale");
        textdomain ("phpwiki");
***************
*** 228,232 ****
           define("LC_ALL", "LC_ALL");
        }   
!       setlocale(LC_ALL, "");
     }
     // end of localization function
--- 230,234 ----
           define("LC_ALL", "LC_ALL");
        }   
!       setlocale(LC_ALL, "$LANG");
     }
     // end of localization function