+ Move reset handling before object creation, otherwise no

[gosa.git] / trunk / gosa-plugins / gofon / gofon / macro / main.inc

diff --git a/trunk/gosa-plugins/gofon/gofon/macro/main.inc b/trunk/gosa-plugins/gofon/gofon/macro/main.inc
index 8d4521ed3ad18e4c0bb86c4371e702e28b0bef3b..1e038e90d65da1bd0f6675cac7a361f0ed7594da 100644 (file)
--- a/trunk/gosa-plugins/gofon/gofon/macro/main.inc
+++ b/trunk/gosa-plugins/gofon/gofon/macro/main.inc
@@ -33,7 +33,10 @@ if ($remove_lock){
 if ( $cleanup ){
   session::un_set('macroManagement');
 }else{
-
+  /* Reset requested? */
+  if (isset($_GET['reset']) && $_GET['reset'] == 1){
+    session::un_set ('macroManagement');
+  }
 
   /* Create macroManagement object on demand */
   if (!session::is_set('macroManagement')){
@@ -55,11 +58,6 @@ if ( $cleanup ){
     $display= print_header(get_template_path('plugins/gofon/images/macros.png'), _("Phone macro management"));
   }
 
-  /* Reset requested? */
-  if (isset($_GET['reset']) && $_GET['reset'] == 1){
-    session::un_set ('macroManagement');
-  }
-
   /* Show and save dialog */
   $display.= $output;
   session::set('macroManagement',$macroManagement);