aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2021-10-01 17:09:54 +0200
committerMario Vavti <mario@mariovavti.com>2021-10-01 17:09:54 +0200
commit069a5429c927f072287e4924be18797fa8b2f2a9 (patch)
tree2e284644950e4256addaa20c38060eaafc0387ed /Zotlabs/Module
parentb1eaa810ce37e4af88fdb41f0067b56f8725ef31 (diff)
parente5e3c268a2ef7bc0450b1ff20c7e0562163f0c92 (diff)
downloadvolse-hubzilla-069a5429c927f072287e4924be18797fa8b2f2a9.tar.gz
volse-hubzilla-069a5429c927f072287e4924be18797fa8b2f2a9.tar.bz2
volse-hubzilla-069a5429c927f072287e4924be18797fa8b2f2a9.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/File_upload.php3
-rw-r--r--Zotlabs/Module/Photos.php4
2 files changed, 7 insertions, 0 deletions
diff --git a/Zotlabs/Module/File_upload.php b/Zotlabs/Module/File_upload.php
index e18067e20..d4c9ad59a 100644
--- a/Zotlabs/Module/File_upload.php
+++ b/Zotlabs/Module/File_upload.php
@@ -99,6 +99,9 @@ class File_upload extends \Zotlabs\Web\Controller {
}
}
+ if(is_ajax())
+ killme();
+
goaway(z_root() . '/' . $_REQUEST['return_url']);
}
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index 3aad70d18..57126df5f 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -171,6 +171,7 @@ class Photos extends \Zotlabs\Web\Controller {
}
goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address']);
+
}
if((argc() > 2) && (x($_REQUEST,'delete')) && ($_REQUEST['delete'] === t('Delete Photo'))) {
@@ -501,6 +502,9 @@ class Photos extends \Zotlabs\Web\Controller {
goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address']);
}
+ if(is_ajax())
+ killme();
+
goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . $r['data']['folder']);
}