From 8d73a7b7b22c41962931d6de4a2bf1abd246f2ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Tue, 11 Apr 2017 11:37:38 +0200
Subject: [PATCH] Fixes #5433 Trying to save NULL value in LDAP caused problems
---
include/class_logging.inc | 9 +++++----
include/simpleplugin/class_simplePlugin.inc | 1 +
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/class_logging.inc b/include/class_logging.inc
index 18aea1442..c84454d92 100644
--- a/include/class_logging.inc
+++ b/include/class_logging.inc
@@ -49,12 +49,13 @@ class logging {
*
* \param $result A status message, containing errors or success messages
*/
- static function log ($action, $objecttype, $object, $changes_array = array(), $result = '')
+ static function log ($action, $objecttype, $object, array $changes_array = array(), $result = '')
{
global $config, $ui;
- if (!is_array($changes_array)) {
- trigger_error('log(string,string,string,array(),bool). Forth parameter must be an array.');
- $changes_array = array();
+
+ if ($result === NULL) {
+ trigger_error('"Result" parameter should not be NULL');
+ $result = '';
}
/* Create data object */
diff --git a/include/simpleplugin/class_simplePlugin.inc b/include/simpleplugin/class_simplePlugin.inc
index 7349af7d1..827190d87 100644
--- a/include/simpleplugin/class_simplePlugin.inc
+++ b/include/simpleplugin/class_simplePlugin.inc
@@ -1385,6 +1385,7 @@ class simplePlugin
*/
function handle_pre_events($mode, array $addAttrs = array())
{
+ $this->ldap_error = '';
return $this->handle_hooks('PRE', $mode, $addAttrs);
}
--
GitLab