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

Remove unused BBCode::scaleExternalImage parameters

Browse source 
- Remove now obsolete system.no_view_full_size config key
This commit is contained in:
Hypolite Petovan 2020-01-02 20:44:15 -05:00
parent 542e83137b
commit 52c5b0e0f3
4 changed files with 6 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/item.php
View file

@ -509,7 +509,7 @@ function item_post(App $a) {
// Fold multi-line [code] sequences // Fold multi-line [code] sequences
$body = preg_replace('/\[\/code\]\s*\[code\]/ism', "\n", $body); $body = preg_replace('/\[\/code\]\s*\[code\]/ism', "\n", $body);
$body = BBCode::scaleExternalImages($body, false); $body = BBCode::scaleExternalImages($body);
// Setting the object type if not defined before // Setting the object type if not defined before
if (!$objecttype) { if (!$objecttype) {

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

@ -436,13 +436,8 @@ class BBCode
} }
} }
public static function scaleExternalImages($srctext, $include_link = true, $scale_replace = false) public static function scaleExternalImages($srctext)
{ {
// Suppress "view full size"
if (intval(Config::get('system', 'no_view_full_size'))) {
$include_link = false;
}
// Picture addresses can contain special characters // Picture addresses can contain special characters
$s = $srctext; $s = $srctext;
@ -457,17 +452,7 @@ class BBCode
continue; continue;
} }
// $scale_replace, if passed, is an array of two elements. The $i = Network::fetchUrl($mtch[1]);
// first is the name of the full-size image. The second is the
// name of a remote, scaled-down version of the full size image.
// This allows Friendica to display the smaller remote image if
// one exists, while still linking to the full-size image
if ($scale_replace) {
$scaled = str_replace($scale_replace[0], $scale_replace[1], $mtch[1]);
} else {
$scaled = $mtch[1];
}
$i = Network::fetchUrl($scaled);
if (!$i) { if (!$i) {
return $srctext; return $srctext;
} }
@ -488,10 +473,8 @@ class BBCode
Logger::log('scale_external_images: ' . $orig_width . '->' . $new_width . 'w ' . $orig_height . '->' . $new_height . 'h' . ' match: ' . $mtch[0], Logger::DEBUG); Logger::log('scale_external_images: ' . $orig_width . '->' . $new_width . 'w ' . $orig_height . '->' . $new_height . 'h' . ' match: ' . $mtch[0], Logger::DEBUG);
$s = str_replace( $s = str_replace(
$mtch[0], $mtch[0],
'[img=' . $new_width . 'x' . $new_height. ']' . $scaled . '[/img]' '[img=' . $new_width . 'x' . $new_height. ']' . $mtch[1] . '[/img]'
. "\n" . (($include_link) . "\n",
? '[url=' . $mtch[1] . ']' . L10n::t('view full size') . '[/url]' . "\n"
: ''),
$s $s
); );
Logger::log('scale_external_images: new string: ' . $s, Logger::DEBUG); Logger::log('scale_external_images: new string: ' . $s, Logger::DEBUG);

2
src/Content/Text/Markdown.php
View file

@ -119,7 +119,7 @@ class Markdown
$s = preg_replace('/(\[code\])+(.*?)(\[\/code\])+/ism', '[code]$2[/code]', $s); $s = preg_replace('/(\[code\])+(.*?)(\[\/code\])+/ism', '[code]$2[/code]', $s);
// Don't show link to full picture (until it is fixed) // Don't show link to full picture (until it is fixed)
$s = BBCode::scaleExternalImages($s, false); $s = BBCode::scaleExternalImages($s);
return $s; return $s;
} }

4
static/defaults.config.php
View file

@ -297,10 +297,6 @@ return [
// Don't show smilies. // Don't show smilies.
'no_smilies' => false, 'no_smilies' => false,
// no_view_full_size (Boolean)
// Don't add the link "View full size" under a resized image.
'no_view_full_size' => false,
// optimize_items (Boolean) // optimize_items (Boolean)
// Triggers an SQL command to optimize the item table before expiring items. // Triggers an SQL command to optimize the item table before expiring items.
'optimize_items' => false, 'optimize_items' => false,