friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Fix deleting last element from saved folder + Fix displaying empty saved folder

This commit is contained in:
Jonny Tischbein 2018-11-17 12:41:00 +01:00
parent 460c257cb4
commit 52eb2281e4
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mod/filerm.php
View File

@ -14,7 +14,7 @@ function filerm_content(App $a)
} }
$term = XML::unescape(trim($_GET['term'])); $term = XML::unescape(trim($_GET['term']));
$cat = XML::unescape(trim($_GET['cat'])); $cat = XML::unescape(trim(defaults($_GET, 'cat', '')));
$category = (($cat) ? true : false); $category = (($cat) ? true : false);
@ -25,12 +25,18 @@ function filerm_content(App $a)
$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0); $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
Logger::log('filerm: tag ' . $term . ' item ' . $item_id); Logger::log('filerm: tag ' . $term . ' item ' . $item_id . ' category ' . ($category ? 'true' : 'false'));
if ($item_id && strlen($term)) if ($item_id && strlen($term))
{ {
FileTag::unsaveFile(local_user(), $item_id, $term, $category); if (FileTag::unsaveFile(local_user(), $item_id, $term, $category)){
info('Item removed');
}
}
else {
info('Item was not deleted');
} }
$a->internalRedirect('/network?f=&file=' . $term);
killme(); killme();
} }

1
mod/network.php
View File

@ -346,6 +346,7 @@ function networkConversation(App $a, $items, Pager $pager, $mode, $update, $orde
// Set this so that the conversation function can find out contact info for our wall-wall items // Set this so that the conversation function can find out contact info for our wall-wall items
$a->page_contact = $a->contact; $a->page_contact = $a->contact;
$items = (empty($items) ? [] : $items);
$o = conversation($a, $items, $pager, $mode, $update, false, $ordering, local_user()); $o = conversation($a, $items, $pager, $mode, $update, false, $ordering, local_user());
if (!$update) { if (!$update) {

2
src/Model/FileTag.php
View File

@ -290,7 +290,7 @@ class FileTag
return false; return false;
} }
$fields = ['file' => str_replace($pattern, '', $item['file'])]; $fields = ['file' => str_replace($pattern, null, $item['file'])];
Item::update($fields, ['id' => $item_id]); Item::update($fields, ['id' => $item_id]);
$r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d", $r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",

2
src/Model/Item.php
View File

@ -911,7 +911,7 @@ class Item extends BaseObject
} }
} }
if (!empty($files)) { if (!is_null($files)) {
Term::insertFromFileFieldByItemId($item['id'], $files); Term::insertFromFileFieldByItemId($item['id'], $files);
if (!empty($item['file'])) { if (!empty($item['file'])) {
DBA::update('item', ['file' => ''], ['id' => $item['id']]); DBA::update('item', ['file' => ''], ['id' => $item['id']]);