clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6092 from JonnyTischbein/issue_drop_item_return_non-frio 

Fix return url when dropping post loaded by update_* in non-frio
This commit is contained in:
Hypolite Petovan 2018-11-06 20:16:28 -05:00 committed by GitHub
parent dc669fa736 93d50af700
commit 27dd913fcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/items.php
View File

@ -410,6 +410,10 @@ function drop_item($id, $return = '')
Item::deleteForUser(['id' => $item['id']], local_user()); Item::deleteForUser(['id' => $item['id']], local_user());
$return_url = hex2bin($return); $return_url = hex2bin($return);
// removes update_* from return_url to ignore Ajax refresh
$return_url = str_replace("update_", "", $return_url);
if (empty($return_url) || strpos($return_url, 'display') !== false) { if (empty($return_url) || strpos($return_url, 'display') !== false) {
$a->internalRedirect('network'); $a->internalRedirect('network');
//NOTREACHED //NOTREACHED

2
mod/update_contacts.php → mod/update_contact.php
View File

@ -7,7 +7,7 @@ use Friendica\Core\L10n;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Module\Contact; use Friendica\Module\Contact;
function update_contacts_content(App $a) function update_contact_content(App $a)
{ {
header("Content-type: text/html"); header("Content-type: text/html");
echo "<!DOCTYPE html><html><body>\r\n"; echo "<!DOCTYPE html><html><body>\r\n";

2
view/js/main.js
View File

@ -390,7 +390,7 @@ function NavUpdate() {
$('nav').trigger('nav-update', data.result); $('nav').trigger('nav-update', data.result);
// start live update // start live update
['network', 'profile', 'community', 'notes', 'display', 'contacts'].forEach(function (src) { ['network', 'profile', 'community', 'notes', 'display', 'contact'].forEach(function (src) {
if ($('#live-' + src).length) { if ($('#live-' + src).length) {
liveUpdate(src); liveUpdate(src);
} }