Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-22 01:11:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix the ' that show ' on PDF

Browse Source
This commit is contained in:
Laurent Destailleur
2021-08-21 12:19:50 +02:00
parent b52ad0500b
commit 68d24661db
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -799,11 +799,11 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
} }
} }
// Ckeditor use the numeric entitic for apostrophe so we force it to text entity (all other special chars are correctly // Ckeditor use the numeric entitic for apostrophe so we force it to text entity (all other special chars are
// encoded using text entities). This is a fix for CKeditor. // encoded using text entities) so we can then exclude all numeric entities.
$out = preg_replace('/'/i', ''', $out); $out = preg_replace('/'/i', ''', $out);
// We replace chars from a/A to z/Z encoded with numeric HTML entities with the real char so we won't loose the chars at the next step. // We replace chars from a/A to z/Z encoded with numeric HTML entities with the real char so we won't loose the chars at the next step (preg_replace).
// No need to use a loop here, this step is not to sanitize (this is done at next step, this is to try to save chars, even if they are // No need to use a loop here, this step is not to sanitize (this is done at next step, this is to try to save chars, even if they are
// using a non coventionnel way to be encoded, to not have them sanitized just after) // using a non coventionnel way to be encoded, to not have them sanitized just after)
$out = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', 'realCharForNumericEntities', $out); $out = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', 'realCharForNumericEntities', $out);
@@ -818,6 +818,9 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
// Warning, the function may add a LF so we are forced to trim to compare with old $out without having always a difference and an infinit loop. // Warning, the function may add a LF so we are forced to trim to compare with old $out without having always a difference and an infinit loop.
$out = trim(dol_string_onlythesehtmlattributes($out)); $out = trim(dol_string_onlythesehtmlattributes($out));
} }
// Restore entity ' into ' (restricthtml is for html content so we can use html entity)
$out = preg_replace('/'/i', "'", $out);
} while ($oldstringtoclean != $out); } while ($oldstringtoclean != $out);
break; break;
case 'custom': case 'custom':