X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fadmin%2Ffiles.php;h=c3ebdea2d6299e38209e16d4884c246c9b4ac1ca;hb=d0b659f7ffd8e1b102837b28c6e1223925557b22;hp=41b52f6df514450ab2404c36553acf40ed442203;hpb=6855525e48fad5de270500a5445c4f4ff85d8bda;p=diogenes.git

diff --git a/include/admin/files.php b/include/admin/files.php
index 41b52f6..c3ebdea 100644
--- 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->toolbar(__("Page"), $fpage->make_toolbar());
+$page->toolbar(__("Page"), $fpage->make_toolbar($page));
 
 
 switch ($action) {
@@ -102,7 +102,8 @@ case "file_rename":
   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;