bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Removed unneeded parameter

Browse source
This commit is contained in:
Michael 2023-07-16 16:48:24 +00:00
parent 7315048474
commit 7e322c21b3
7 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Content/Text/BBCode.php
View file

@ -226,7 +226,7 @@ class BBCode
* @param bool $keep_urls Whether to keep URLs in the resulting plaintext * @param bool $keep_urls Whether to keep URLs in the resulting plaintext
* @return string * @return string
*/ */
public static function toPlaintext(string $text, bool $keep_urls = true, bool $strip_tags = false): string public static function toPlaintext(string $text, bool $keep_urls = true): string
{ {
DI::profiler()->startRecording('rendering'); DI::profiler()->startRecording('rendering');
// Remove pictures in advance to avoid unneeded proxy calls // Remove pictures in advance to avoid unneeded proxy calls
@ -238,9 +238,6 @@ class BBCode
$naked_text = HTML::toPlaintext(self::convert($text, false, BBCode::EXTERNAL, true), 0, !$keep_urls); $naked_text = HTML::toPlaintext(self::convert($text, false, BBCode::EXTERNAL, true), 0, !$keep_urls);
if ($strip_tags) {
$naked_text = strip_tags($naked_text);
}
DI::profiler()->stopRecording(); DI::profiler()->stopRecording();
return $naked_text; return $naked_text;
} }

2
src/Model/Event.php
View file

@ -1012,7 +1012,7 @@ class Event
} }
} }
$location['name'] = BBCode::toPlaintext($location['name'], false, true); $location['name'] = BBCode::toPlaintext($location['name'], false);
// Construct the map HTML. // Construct the map HTML.
if (isset($location['address'])) { if (isset($location['address'])) {

4
src/Model/Profile.php
View file

@ -640,13 +640,13 @@ class Profile
$istoday = true; $istoday = true;
} }
$title = BBCode::toPlaintext($rr['summary'], false, true); $title = BBCode::toPlaintext($rr['summary'], false);
if (strlen($title) > 35) { if (strlen($title) > 35) {
$title = substr($title, 0, 32) . '... '; $title = substr($title, 0, 32) . '... ';
} }
$description = BBCode::toPlaintext($rr['desc'], false, true) . '... '; $description = BBCode::toPlaintext($rr['desc'], false) . '... ';
if (!$description) { if (!$description) {
$description = DI::l10n()->t('[No description]'); $description = DI::l10n()->t('[No description]');
} }

2
src/Module/Notifications/Introductions.php
View file

@ -147,7 +147,7 @@ class Introductions extends BaseNotifications
$knowyou = ''; $knowyou = '';
} }
$convertedName = BBCode::toPlaintext($Introduction->getName(), false, true); $convertedName = BBCode::toPlaintext($Introduction->getName(), false);
$helptext = $this->t('Shall your connection be bidirectional or not?'); $helptext = $this->t('Shall your connection be bidirectional or not?');
$helptext2 = $this->t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $convertedName, $convertedName); $helptext2 = $this->t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $convertedName, $convertedName);

4
src/Navigation/Notifications/Entity/Notify.php
View file

@ -118,7 +118,7 @@ class Notify extends BaseEntity
public function updateMsgFromPreamble($epreamble) public function updateMsgFromPreamble($epreamble)
{ {
$this->msg = Renderer::replaceMacros($epreamble, ['$itemlink' => $this->link->__toString()]); $this->msg = Renderer::replaceMacros($epreamble, ['$itemlink' => $this->link->__toString()]);
$this->msg_cache = self::formatMessage($this->name_cache, BBCode::toPlaintext($this->msg, false, true)); $this->msg_cache = self::formatMessage($this->name_cache, BBCode::toPlaintext($this->msg, false));
} }
/** /**
@ -134,6 +134,6 @@ class Notify extends BaseEntity
*/ */
public static function formatMessage(string $name, string $message): string public static function formatMessage(string $name, string $message): string
{ {
return str_replace('{0}', '<span class="contactname">' . BBCode::toPlaintext($name, false, true) . '</span>', htmlspecialchars($message)); return str_replace('{0}', '<span class="contactname">' . BBCode::toPlaintext($name, false) . '</span>', htmlspecialchars($message));
} }
} }

2
src/Navigation/Notifications/Factory/FormattedNotify.php
View file

@ -222,7 +222,7 @@ class FormattedNotify extends BaseFactory
$this->baseUrl . '/notify/' . $Notify->id, $this->baseUrl . '/notify/' . $Notify->id,
Contact::getAvatarUrlForUrl($Notify->url, $Notify->uid, Proxy::SIZE_MICRO), Contact::getAvatarUrlForUrl($Notify->url, $Notify->uid, Proxy::SIZE_MICRO),
$Notify->url, $Notify->url,
BBCode::toPlaintext($Notify->msg ?? '', false, true), BBCode::toPlaintext($Notify->msg ?? '', false),
DateTimeFormat::local($Notify->date->format(DateTimeFormat::MYSQL), 'r'), DateTimeFormat::local($Notify->date->format(DateTimeFormat::MYSQL), 'r'),
Temporal::getRelativeDate($Notify->date->format(DateTimeFormat::MYSQL)), Temporal::getRelativeDate($Notify->date->format(DateTimeFormat::MYSQL)),
$Notify->seen $Notify->seen

2
src/Navigation/Notifications/Factory/Notify.php
View file

@ -68,7 +68,7 @@ class Notify extends BaseFactory implements ICanCreateFromTableRow
false, false,
$params['verb'] ?? '', $params['verb'] ?? '',
$params['otype'] ?? '', $params['otype'] ?? '',
substr(BBCode::toPlaintext($params['source_name'], false, true), 0, 255), substr(BBCode::toPlaintext($params['source_name'], false), 0, 255),
null, null,
null, null,
$item_id, $item_id,