lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix use command standard @... to mark a change in official code

Browse Source
This commit is contained in:
Laurent Destailleur 2017-07-17 20:20:38 +02:00
parent 4582b54e91
commit e5ec0a785d
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/dolibarr_changes.txt
View File

@ -5,7 +5,7 @@ in Dolibarr root.
ALL:
----
Check "DOL_CHANGE"
Check "@CHANGE"
CKEDITOR (4.6.2):

4
htdocs/core/filemanagerdol/connectors/php/commands.php
View File

@ -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 == '')
{

2
htdocs/core/filemanagerdol/connectors/php/io.php
View File

@ -388,7 +388,7 @@ EOF;
}
// DOL_CHANGE
// @CHANGE
// This is the function that sends the results of the uploading process to CKE.
/**

2
htdocs/core/filemanagerdol/connectors/php/upload.php
View File

@ -60,7 +60,7 @@ if (! IsAllowedType($sType))
SendUploadResults(1, '', '', 'Invalid type specified');
// DOL_CHANGE
// @CHANGE
//FileUpload( $sType, $sCurrentFolder, $sCommand )
// Get the CKEditor Callback

4
htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js vendored
View File

@ -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

4
htdocs/includes/nusoap/lib/nusoap.php
View File

@ -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);