[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/inc functions.inc.php
From: |
Dave Hall |
Subject: |
[Phpgroupware-cvs] phpgwapi/inc functions.inc.php |
Date: |
Wed, 27 Dec 2006 12:25:17 +0000 |
CVSROOT: /sources/phpgwapi
Module name: phpgwapi
Changes by: Dave Hall <skwashd> 06/12/27 12:25:17
Modified files:
inc : functions.inc.php
Log message:
handle objects better
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/functions.inc.php?cvsroot=phpgwapi&r1=1.211&r2=1.212
Patches:
Index: functions.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -b -r1.211 -r1.212
--- functions.inc.php 10 Nov 2006 13:33:49 -0000 1.211
+++ functions.inc.php 27 Dec 2006 12:25:17 -0000 1.212
@@ -8,7 +8,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage utilities
- * @version $Id: functions.inc.php,v 1.211 2006/11/10 13:33:49 sigurdne
Exp $
+ * @version $Id: functions.inc.php,v 1.212 2006/12/27 12:25:17 skwashd
Exp $
*/
@@ -192,9 +192,10 @@
}
// Drop passwords from backtrace
- if ( $arg ==
$GLOBALS['phpgw_info']['server']['header_admin_password']
+ if ( !is_object($arg)
+ && ($arg ==
$GLOBALS['phpgw_info']['server']['header_admin_password']
|| $arg ==
$GLOBALS['phpgw_info']['server']['db_pass']
- ||
(isset($GLOBALS['phpgw_info']['user']['passwd']) && $arg ==
$GLOBALS['phpgw_info']['user']['passwd'] )
+ ||
(isset($GLOBALS['phpgw_info']['user']['passwd']) && $arg ==
$GLOBALS['phpgw_info']['user']['passwd'] ) )
)
{
$trace[$num]['args'][$anum] =
'***PASSWORD***';
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/inc functions.inc.php,
Dave Hall <=