Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2024-08-28 19:13:48 +02:00
commit b3c28155b7
5 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/doleditor.class.php
View File

@ -252,7 +252,7 @@ class DolEditor
}
*/
},
disableNativeSpellChecker: '.(!getDolGlobalString('CKEDITOR_NATIVE_SPELLCHECKER') ? 'true' : 'false');
disableNativeSpellChecker: '.(getDolGlobalString('CKEDITOR_NATIVE_SPELLCHECKER') ? 'false' : 'true');
if ($this->uselocalbrowser) {
$out .= ','."\n";

2
htdocs/core/filemanagerdol/browser/default/frmfolders.php
View File

@ -184,6 +184,8 @@ function OpenFolder( folderPath )
function LoadFolders( folderPath )
{
console.log("LoadFolders folderPath="+folderPath);
// Clear the folders list.
oListManager.Clear();

2
htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
View File

@ -131,6 +131,8 @@ oListManager.GetFileRowHtml = function( fileName, fileUrl, fileSize )
function OpenFolder( folderPath )
{
console.log("OpenFolder folderPath="+folderPath);
// Load the resources list for this folder.
window.parent.frames['frmFolders'].LoadFolders( folderPath );
}

2
htdocs/core/filemanagerdol/connectors/php/connector.lib.php
View File

@ -742,7 +742,7 @@ function IsAllowedCommand($sCommand)
*/
function GetCurrentFolder()
{
$sCurrentFolder = isset($_GET['CurrentFolder']) ? GETPOST('CurrentFolder', '', 1) : '/';
$sCurrentFolder = isset($_GET['CurrentFolder']) ? GETPOST('CurrentFolder', 'alphanohtml', 1) : '/';
// Check the current folder syntax (must begin and start with a slash).
if (!preg_match('|/$|', $sCurrentFolder)) {

2
htdocs/website/index.php
View File

@ -3430,6 +3430,8 @@ if (!GETPOST('hide_websitemenu')) {
// Edit CKEditor
if (getDolGlobalInt('WEBSITE_ALLOW_CKEDITOR')) {
print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editcontent&token='.newToken().'" class="button bordertransp"'.$disabled.'>'.dol_escape_htmltag("CKEditor").'</a>';
} else {
print '<!-- Add option WEBSITE_ALLOW_CKEDITOR to allow ckeditor -->';
}
print '</span>';