From e5ec0a785d298db69cdbb2c74ab1662cb8ce2ca6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Jul 2017 20:20:38 +0200
Subject: [PATCH] Fix use command standard @... to mark a change in official
code
---
dev/dolibarr_changes.txt | 2 +-
htdocs/core/filemanagerdol/connectors/php/commands.php | 4 ++--
htdocs/core/filemanagerdol/connectors/php/io.php | 2 +-
htdocs/core/filemanagerdol/connectors/php/upload.php | 2 +-
.../includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js | 4 ++--
htdocs/includes/nusoap/lib/nusoap.php | 4 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index 9b82bd05b2a..3b9ef4cc447 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -5,7 +5,7 @@ in Dolibarr root.
ALL:
----
-Check "DOL_CHANGE"
+Check "@CHANGE"
CKEDITOR (4.6.2):
diff --git a/htdocs/core/filemanagerdol/connectors/php/commands.php b/htdocs/core/filemanagerdol/connectors/php/commands.php
index 5c8e76a9522..5523708a3a0 100644
--- a/htdocs/core/filemanagerdol/connectors/php/commands.php
+++ b/htdocs/core/filemanagerdol/connectors/php/commands.php
@@ -183,7 +183,7 @@ function CreateFolder( $resourceType, $currentFolder )
echo '<Error number="' . $sErrorNumber . '" />' ;
}
-// DOL_CHANGE
+// @CHANGE
//function FileUpload( $resourceType, $currentFolder, $sCommand )
/**
* FileUpload
@@ -308,7 +308,7 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
$sFileUrl = CombinePaths($sFileUrl, $sFileName);
- // DOL_CHANGE
+ // @CHANGE
//SendUploadResults( $sErrorNumber, $sFileUrl, $sFileName );
if($CKEcallback == '')
{
diff --git a/htdocs/core/filemanagerdol/connectors/php/io.php b/htdocs/core/filemanagerdol/connectors/php/io.php
index 77c8c3ec253..66d024edce8 100644
--- a/htdocs/core/filemanagerdol/connectors/php/io.php
+++ b/htdocs/core/filemanagerdol/connectors/php/io.php
@@ -388,7 +388,7 @@ EOF;
}
-// DOL_CHANGE
+// @CHANGE
// This is the function that sends the results of the uploading process to CKE.
/**
diff --git a/htdocs/core/filemanagerdol/connectors/php/upload.php b/htdocs/core/filemanagerdol/connectors/php/upload.php
index dc7235dc8a8..90230504705 100644
--- a/htdocs/core/filemanagerdol/connectors/php/upload.php
+++ b/htdocs/core/filemanagerdol/connectors/php/upload.php
@@ -60,7 +60,7 @@ if (! IsAllowedType($sType))
SendUploadResults(1, '', '', 'Invalid type specified');
-// DOL_CHANGE
+// @CHANGE
//FileUpload( $sType, $sCurrentFolder, $sCommand )
// Get the CKEditor Callback
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js b/htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
index 390f71cda16..795e4a7deb7 100644
--- a/htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
+++ b/htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
@@ -60,7 +60,7 @@ if(jQuery) (function($){
}
function bindTree(t) {
- /* DOL_CHANGE Replace LI A by LI A.jqft */
+ /* @CHANGE Replace LI A by LI A.jqft */
$(t).find('LI A.jqft').bind(o.folderEvent, function() {
if( $(this).parent().hasClass('directory') ) {
if( $(this).parent().hasClass('collapsed') ) {
@@ -85,7 +85,7 @@ if(jQuery) (function($){
return false;
});
// Prevent A from triggering the # on non-click events
- /* DOL_CHANGE Replace LI A by LI A.jqft */
+ /* @CHANGE Replace LI A by LI A.jqft */
if( o.folderEvent.toLowerCase != 'click' ) $(t).find('LI A.jqft').bind('click', function() { return false; });
}
// Loading message
diff --git a/htdocs/includes/nusoap/lib/nusoap.php b/htdocs/includes/nusoap/lib/nusoap.php
index 3113a0ee513..56d1cf4c1a8 100644
--- a/htdocs/includes/nusoap/lib/nusoap.php
+++ b/htdocs/includes/nusoap/lib/nusoap.php
@@ -573,7 +573,7 @@ class nusoap_base {
}
$array_types[$tt] = 1;
// TODO: for literal, the name should be $name
- // DOL_CHANGE This is to have tag name with name reported by wsdl and not "item"
+ // @CHANGE This is to have tag name with name reported by wsdl and not "item"
//$xml .= $this->serialize_val($v,'item',false,false,false,false,$use);
$tmp=preg_replace('/s$/i','',$name);
$xml .= $this->serialize_val($v,$tmp?$tmp:'item',false,false,false,false,$use);
@@ -6128,7 +6128,7 @@ class wsdl extends nusoap_base {
if (!in_array($typeDef['arrayType'],$this->typemap['http://www.w3.org/2001/XMLSchema'])) {
$contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);
} else {
- // DOL_CHANGE This is to have tag name with name reported by wsdl and not "item"
+ // @CHANGE This is to have tag name with name reported by wsdl and not "item"
//$contents .= $this->serialize_val($v, 'itemzzzz', $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);
$tmp=array_keys($typeDef['elements']); //var_dump($tmp[0]);
$contents .= $this->serialize_val($v, ($tmp[0]?$tmp[0]:'item'), $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);
--
GitLab