mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Standards

Browse source 
fix indentation level, replace x() with !empty()
This commit is contained in:
Adam Magness 2018-11-07 14:16:59 -05:00
parent 7cb9138201
commit 003eee5912
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Model/Item.php
View file

@ -3497,7 +3497,7 @@ class Item extends BaseObject
} }
// Replace friendica image url size with theme preference. // Replace friendica image url size with theme preference.
if (x($a->theme_info, 'item_image_size')) { if (!empty($a->theme_info['item_image_size'])) {
$ps = $a->theme_info['item_image_size']; $ps = $a->theme_info['item_image_size'];
$s = preg_replace('|(<img[^>]+src="[^"]+/photo/[0-9a-f]+)-[0-9]|', "$1-" . $ps, $s); $s = preg_replace('|(<img[^>]+src="[^"]+/photo/[0-9a-f]+)-[0-9]|', "$1-" . $ps, $s);
} }
@ -3521,23 +3521,23 @@ class Item extends BaseObject
if ($a->user['nickname'] != "") { if ($a->user['nickname'] != "") {
$ret = [ $ret = [
'href' => "display/" . $item['guid'], 'href' => "display/" . $item['guid'],
'orig' => "display/" . $item['guid'], 'orig' => "display/" . $item['guid'],
'title' => L10n::t('View on separate page'), 'title' => L10n::t('View on separate page'),
'orig_title' => L10n::t('view on separate page'), 'orig_title' => L10n::t('view on separate page'),
]; ];
if (x($item, 'plink')) { if (!empty($item['plink'])) {
$ret["href"] = $a->removeBaseURL($item['plink']); $ret["href"] = $a->removeBaseURL($item['plink']);
$ret["title"] = L10n::t('link to source'); $ret["title"] = L10n::t('link to source');
} }
} elseif (x($item, 'plink') && ($item['private'] != 1)) { } elseif (!empty($item['plink']) && ($item['private'] != 1)) {
$ret = [ $ret = [
'href' => $item['plink'], 'href' => $item['plink'],
'orig' => $item['plink'], 'orig' => $item['plink'],
'title' => L10n::t('link to source'), 'title' => L10n::t('link to source'),
]; ];
} else { } else {
$ret = []; $ret = [];
} }