mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

better listen on toggle_dir and remember

Browse Source
This commit is contained in:
Ian
2015-10-26 11:36:57 +01:00
parent 52730e6b0e
commit d1baaf4983
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/admin/images.inc.php
View File

@ -14,10 +14,19 @@ if (!is_object($serendipity['smarty'])) {
serendipity_smarty_init();
}
// No echo output here, before the switch, since that matters renaming alerts!
// unset adminAction type to default, if an image was bulkmoved and the origin page reloaded
if (!is_array($serendipity['POST']) && $serendipity['GET']['adminAction'] == 'multidelete') {
unset($serendipity['GET']['adminAction']);
}
// Listens on toggle_dir STRICT to list items per directory, or include all sub directory items
if (empty($serendipity['GET']['toggle_dir']) && empty($serendipity['COOKIE']['serendipity_toggle_dir'])) {
$serendipity['GET']['toggle_dir'] = 'no'; // default
}
if (!empty($serendipity['COOKIE']['serendipity_toggle_dir'])) {
serendipity_restoreVar($serendipity['COOKIE']['serendipity_toggle_dir'], $serendipity['GET']['toggle_dir']);
}
switch ($serendipity['GET']['adminAction']) {
@ -72,7 +81,6 @@ switch ($serendipity['GET']['adminAction']) {
unset($messages);
break;
case 'doMultiDelete':
if (!serendipity_checkFormToken() || !serendipity_checkPermission('adminImagesDelete')) {
break;