projects
/
diogenes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* improved - after adding a page, return to the calling url
[diogenes.git]
/
include
/
admin
/
files.php
diff --git
a/include/admin/files.php
b/include/admin/files.php
index
41b52f6
..
c3ebdea
100644
(file)
--- a/
include/admin/files.php
+++ b/
include/admin/files.php
@@
-58,7
+58,7
@@
$page->assign('msg_read_perms',__("read access"));
$page->assign('msg_write_perms',__("write access"));
// build navigation toolbar
$page->assign('msg_write_perms',__("write access"));
// build navigation toolbar
-$page->toolbar(__("Page"), $fpage->make_toolbar());
+$page->toolbar(__("Page"), $fpage->make_toolbar(
$page
));
switch ($action) {
switch ($action) {
@@
-102,7
+102,8
@@
case "file_rename":
break;
case "page_delete":
break;
case "page_delete":
- Diogenes_Barrel_Page::delete($bbarrel, $target, $page);
+ $target_path = $bbarrel->getLocation($target);
+ $bbarrel->rmPath($target_path, $page);
$fpages = $bbarrel->getPages();
break;
$fpages = $bbarrel->getPages();
break;