mirror of
https://github.com/moodle/moodle.git
synced 2025-04-22 08:55:15 +02:00
MDL-7541 Fixed wiki html diff
This commit is contained in:
parent
44968276c1
commit
c2a95d4db6
@ -46,15 +46,16 @@
|
||||
$content0 = preg_replace('/(\S)\s+(\S)/', '$1 $2', $content0); // Remove multiple spaces.
|
||||
$content = preg_replace('/\n|\r/i', ' ', $content);
|
||||
$content = preg_replace('/(\S)\s+(\S)/', '$1 $2', $content);
|
||||
|
||||
|
||||
/// Replace <p> </p>
|
||||
$content0 = preg_replace('#(<p.*>( |\s+)</p>|<p.*></p>)#i', "\n", $content0);
|
||||
$content = preg_replace('#(<p.*>( |\s+)</p>|<p.*></p>)#i', "\n", $content);
|
||||
$content0 = preg_replace('#(<p( [^>]*)?>( |\s+)</p>)|(<p( [^>]*)?></p>)#i', "\n", $content0);
|
||||
$content = preg_replace('#(<p( [^>]*)?>( |\s+)</p>)|(<p( [^>]*)?></p>)#i', "\n", $content);
|
||||
|
||||
|
||||
/// Place new line characters at logical HTML positions.
|
||||
$htmlendings = array('+(<br.*>)+iU', '+(<p.*>)+iU', '+(</p>)+i', '+(<hr.*>)+iU', '+(<ol.*>)+iU',
|
||||
'+(</ol>)+i', '+(<ul.*>)+iU', '+(</ul>)+i', '+(<li.*>)+iU', '+(</li>)+i',
|
||||
'+(</tr>)+i', '+(<div.*>)+iU', '+(</div>)+i');
|
||||
$htmlendings = array('+(<br.*?>)+iU', '+(<p( [^>]*)?>)+iU', '+(</p>)+i', '+(<hr.*?>)+iU', '+(<ol.*?>)+iU',
|
||||
'+(</ol>)+i', '+(<ul.*?>)+iU', '+(</ul>)+i', '+(<li.*?>)+iU', '+(</li>)+i',
|
||||
'+(</tr>)+i', '+(<div.*?>)+iU', '+(</div>)+i');
|
||||
$htmlrepl = array("\n\$1\n", "\n\$1\n", "\n\$1\n", "\n\$1\n", "\n\$1\n",
|
||||
"\n\$1\n", "\n\$1\n", "\n\$1\n", "\n\$1\n", "\n\$1\n",
|
||||
"\n\$1\n", "\n\$1\n", "\n\$1\n");
|
||||
|
Loading…
x
Reference in New Issue
Block a user