Skip to content

Commit 9676cfd

Browse files
committed
Fix PHP 8 warnings re uninitialised variables
1 parent e59bb58 commit 9676cfd

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

root/inc/plugins/linktools.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ function linktools_info() {
168168
$desc .= '<ul>'.PHP_EOL;
169169

170170
if (!empty($admin_session['data']['lkt_plugin_info_upgrade_message'])) {
171-
$msg = $admin_session['data']['lkt_plugin_info_upgrade_message'].' '.$msg;
171+
$msg = $admin_session['data']['lkt_plugin_info_upgrade_message'];
172172
update_admin_session('lkt_plugin_info_upgrade_message', '');
173173
$desc .= " <li style=\"list-style-image: url(styles/default/images/icons/success.png)\"><div class=\"success\">{$msg}</div></li>".PHP_EOL;
174174
}

root/inc/plugins/linktools/link-previewers-dist/LinkPreviewerPlainText.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
class LinkPreviewerPlainText extends LinkPreviewer {
2727
/**
2828
* Provisionally support all links (subject to the page to which a
29-
* link refers having a content-type of text/html).
29+
* link refers having a content-type of text/plain).
3030
*/
3131
protected $supported_norm_links_regex = '(^)';
3232

@@ -64,6 +64,8 @@ class LinkPreviewerPlainText extends LinkPreviewer {
6464
</a>
6565
</div>';
6666

67+
protected $max_chars = 83;
68+
6769
/**
6870
* Only support previews of plain text content.
6971
*/
@@ -81,12 +83,10 @@ public function get_preview_data($link, $content, $content_type) {
8183
return '';
8284
}
8385

84-
$max_chars = 83;
85-
8686
$description = trim(preg_replace('(\\s+)', ' ', strip_tags($content)));
87-
$need_ellipsis_desc = strlen($description) > $max_chars;
87+
$need_ellipsis_desc = strlen($description) > $this->max_chars;
8888
if ($need_ellipsis_desc) {
89-
$description = my_substr($description, 0, $max_chars);
89+
$description = my_substr($description, 0, $this->max_chars);
9090
}
9191
$description_safe = htmlspecialchars_uni($description);
9292
if ($need_ellipsis_desc) $description_safe .= '&hellip;';
@@ -102,9 +102,9 @@ protected function get_preview_contents($link, $pv_data) {
102102

103103
$link_safe = htmlspecialchars_uni($link);
104104
$link_basename = basename($link);
105-
$need_ellipsis_basename = my_strlen($link_basename) > $max_chars;
105+
$need_ellipsis_basename = my_strlen($link_basename) > $this->max_chars;
106106
if ($need_ellipsis_basename) {
107-
$link_basename = my_substr($link_basename, 0, $max_chars);
107+
$link_basename = my_substr($link_basename, 0, $this->max_chars);
108108
}
109109
$link_basename_safe = htmlspecialchars_uni($link_basename);
110110
if ($need_ellipsis_basename) $link_basename_safe .= '&hellip;';

0 commit comments

Comments
 (0)