Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2016-05-30 00:52:59 +02:00
parent 3ddf427ff1 4c93340de1
commit 2dcc578b88
14 changed files with 91 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/ldap.class.php
View File

@@ -823,7 +823,7 @@ class Ldap
*
* @param string $dn DN entry key
* @param string $filter Filter
* @return int|false|array <0 or false if KO, array if OK
* @return int|array <0 or false if KO, array if OK
*/
function getAttribute($dn,$filter)
{
@@ -848,7 +848,7 @@ class Ldap
{
$this->ldapErrorCode = -1;
$this->ldapErrorText = "Couldn't find entry";
return false; // Couldn't find entry...
return 0; // Couldn't find entry...
}
// Get values
@@ -856,7 +856,7 @@ class Ldap
{
$this->ldapErrorCode = ldap_errno($this->connection);
$this->ldapErrorText = ldap_error($this->connection);
return false; // No matching attributes
return 0; // No matching attributes
}
// Return an array containing the attributes.

2
htdocs/core/lib/functions.lib.php
View File

@@ -2778,7 +2778,7 @@ function dol_print_error($db='',$error='',$errors=null)
if (empty($msg)) continue;
if ($_SERVER['DOCUMENT_ROOT']) // Mode web
{
$out.="<b>".$langs->trans("Message").":</b> ".$msg."<br>\n" ;
$out.="<b>".$langs->trans("Message").":</b> ".dol_escape_htmltag($msg)."<br>\n" ;
}
else // Mode CLI
{

4
htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
View File

@@ -119,6 +119,7 @@ class InterfaceDemo extends DolibarrTriggers
case 'ORDER_CANCEL':
case 'ORDER_SENTBYMAIL':
case 'ORDER_CLASSIFY_BILLED':
case 'ORDER_SETDRAFT':
case 'LINEORDER_INSERT':
case 'LINEORDER_UPDATE':
case 'LINEORDER_DELETE':
@@ -258,6 +259,9 @@ class InterfaceDemo extends DolibarrTriggers
case 'SHIPPING_MODIFY':
case 'SHIPPING_VALIDATE':
case 'SHIPPING_SENTBYMAIL':
case 'SHIPPING_BILLED':
case 'SHIPPING_CLOSED':
case 'SHIPPING_REOPEN':
case 'SHIPPING_DELETE':
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
break;