Should be a better fix so this hook now works with plugins that have been using it...

[squirrelmail.git] / functions / folder_manip.php

diff --git a/functions/folder_manip.php b/functions/folder_manip.php
index c080f1c77044027d80a8ed12829bcb56abc39400..1cb817419e9a7c4a25434ee0c255ed4f0c7547bf 100644 (file)
--- a/functions/folder_manip.php
+++ b/functions/folder_manip.php
@@ -124,11 +124,10 @@ function folders_rename_getname ($imapConnection, $delimiter, $old) {
     sqimap_logout($imapConnection);
 
     $oTemplate->assign('dialog_type', 'rename');
-    $oTemplate->assign('color', $color);
-    $oTemplate->assign('old_parent', htmlspecialchars($old_parent));
-    $oTemplate->assign('old', htmlspecialchars($old));
-    $oTemplate->assign('old_name', htmlspecialchars($old_name));
-    $oTemplate->assign('isfolder', $isfolder);
+    $oTemplate->assign('parent_folder', htmlspecialchars($old_parent));
+    $oTemplate->assign('current_full_name', htmlspecialchars($old));
+    $oTemplate->assign('current_folder_name', htmlspecialchars($old_name));
+    $oTemplate->assign('is_folder', $isfolder);
     
     $oTemplate->display('folder_manip_dialog.tpl');
     $oTemplate->display('footer.tpl');
@@ -199,7 +198,6 @@ function folders_delete_ask ($imapConnection, $folder_name)
     sqimap_logout($imapConnection);
 
     $oTemplate->assign('dialog_type', 'delete');
-    $oTemplate->assign('color', $color);
     $oTemplate->assign('folder_name', htmlspecialchars($folder_name));
     $oTemplate->assign('visible_folder_name', htmlspecialchars($visible_folder_name));