From d24eab1fbf868831e74ed982f3c74868ae029b4c Mon Sep 17 00:00:00 2001
From: Matthieu Marcillaud <marcimat@rezo.net>
Date: Tue, 24 Mar 2015 15:20:53 +0000
Subject: [PATCH] Notices PHP en moins en utilisant SPIP depuis la ligne de
commande (PHP cli).
---
ecrire/base/abstract_sql.php | 4 +++-
ecrire/inc/log.php | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ecrire/base/abstract_sql.php b/ecrire/base/abstract_sql.php
index ab647150ae..741d8d870a 100644
--- a/ecrire/base/abstract_sql.php
+++ b/ecrire/base/abstract_sql.php
@@ -40,7 +40,9 @@ function sql_error_backtrace($compil_info = false){
$contexte_compil = array(
$trace[0]['file'],// sourcefile
'', //nom
- $trace[1]['function']."(){\n".$trace[0]['function']."();\n}", //id_boucle
+ (isset($trace[1]) ? $trace[1]['function']."(){\n" : '')
+ . $trace[0]['function']."();"
+ . (isset($trace[1]) ? "\n}" : ''), //id_boucle
$trace[0]['line'], // ligne
$GLOBALS['spip_lang'], // lang
);
diff --git a/ecrire/inc/log.php b/ecrire/inc/log.php
index ed13041f61..1aa5719c4e 100644
--- a/ecrire/inc/log.php
+++ b/ecrire/inc/log.php
@@ -59,7 +59,7 @@ function inc_log_dist($message, $logname=NULL, $logdir=NULL, $logsuf=NULL) {
$debugverb = "$fi:L$l:$fu"."():";
}
- $m = date("M d H:i:s").' '.$GLOBALS['ip'].' '.$pid.' '
+ $m = date("M d H:i:s").' '. (isset($GLOBALS['ip']) ? $GLOBALS['ip'] : '') .' '.$pid.' '
//distinguer les logs prives et publics dans les grep
. $debugverb
. (test_espace_prive()?':Pri:':':Pub:')
--
GitLab