Minahito
minah****@users*****
2006年 8月 9日 (水) 18:34:19 JST
Index: xoops2jp/html/include/functions.php
diff -u xoops2jp/html/include/functions.php:1.2.8.15 xoops2jp/html/include/functions.php:1.2.8.16
--- xoops2jp/html/include/functions.php:1.2.8.15 Fri Apr 21 12:15:00 2006
+++ xoops2jp/html/include/functions.php Wed Aug 9 18:34:19 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: functions.php,v 1.2.8.15 2006/04/21 03:15:00 minahito Exp $
+// $Id: functions.php,v 1.2.8.16 2006/08/09 09:34:19 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -448,12 +448,14 @@
function xoops_getenv($key)
{
- $ret = '';
+ $ret = null;
//$phpv = explode(".", PHP_VERSION);
//if ($phpv[0] > 3 && $phpv[1] > 0) {
// $ret = isset($_SERVER[$key]) ? $_SERVER[$key] : $_ENV[$key];
//} else {
- $ret = isset($_SERVER[$key]) ? $_SERVER[$key] : $_ENV[$key];
+ if (isset($_SERVER[$key]) || isset($_ENV[$key])) {
+ $ret = isset($_SERVER[$key]) ? $_SERVER[$key] : $_ENV[$key];
+ }
//}
switch($key) {