Merge remote-tracking branch 'upstream/2023.03-rc' into npf2

This commit is contained in:
Michael 2023-03-27 06:42:24 +00:00
commit c4c80ed3cc
266 changed files with 691 additions and 643 deletions

View file

@ -548,7 +548,7 @@ class BBCode
/*
* The previously spacefied [noparse][ i ]italic[ /i ][/noparse],
* now turns back and the [noparse] tags are trimed
* now turns back and the [noparse] tags are trimmed
* returning [i]italic[/i]
*
* @param array $match
@ -1373,7 +1373,7 @@ class BBCode
});
}
// leave open the posibility of [map=something]
// leave open the possibility of [map=something]
// this is replaced in Item::prepareBody() which has knowledge of the item location
if (strpos($text, '[/map]') !== false) {
$text = preg_replace_callback(

View file

@ -842,7 +842,7 @@ class HTML
*
* @param string $s Search query.
* @param string $id HTML id
* @param bool $aside Display the search widgit aside.
* @param bool $aside Display the search widget aside.
*
* @return string Formatted HTML.
* @throws \Exception

View file

@ -180,7 +180,7 @@ class Plaintext
$msg = trim($post['description']);
}
// If the link is already contained in the post, then it neeedn't to be added again
// If the link is already contained in the post, then it needn't to be added again
// But: if the link is beyond the limit, then it has to be added.
if (($link != '') && strstr($msg, $link)) {
$pos = strpos($msg, $link);