Changeset 1068:bb240da6a058

Timestamp:

12/14/12 18:35:15 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Cope with post deletion sooner

Files:

• admin/post.php (modified) (2 diffs)
• plugins/pages/page.php (modified) (2 diffs)

admin/post.php

@@ -202 +202 @@
 }
 
+# Delete post
+if (!empty($_POST['delete']) && $can_delete)
+{
+     try {
+          # --BEHAVIOR-- adminBeforePostDelete
+          $core->callBehavior('adminBeforePostDelete',$post_id);
+          $core->blog->delPost($post_id);
+          http::redirect('posts.php');
+     } catch (Exception $e) {
+          $core->error->add($e->getMessage());
+     }
+}
+
 # Create or update post
 if (!empty($_POST) && !empty($_POST['save']) && $can_edit_post && !$bad_dt)
@@ -268 +281 @@
                $core->error->add($e->getMessage());
           }
-     }
-}
-
-if (!empty($_POST['delete']) && $can_delete)
-{
-     try {
-          # --BEHAVIOR-- adminBeforePostDelete
-          $core->callBehavior('adminBeforePostDelete',$post_id);
-          $core->blog->delPost($post_id);
-          http::redirect('posts.php');
-     } catch (Exception $e) {
-          $core->error->add($e->getMessage());
      }
 }

plugins/pages/page.php

@@ -193 +193 @@
 }
 
-# Create or update post
+# Delete page
+if (!empty($_POST['delete']) && $can_delete)
+{
+     try {
+          # --BEHAVIOR-- adminBeforePageDelete
+          $core->callBehavior('adminBeforePageDelete',$post_id);
+          $core->blog->delPost($post_id);
+          http::redirect($p_url);
+     } catch (Exception $e) {
+          $core->error->add($e->getMessage());
+     }
+}
+
+# Create or update page
 if (!empty($_POST) && !empty($_POST['save']) && $can_edit_page && !$bad_dt)
 {
@@ -263 +276 @@
                $core->error->add($e->getMessage());
           }
-     }
-}
-
-if (!empty($_POST['delete']) && $can_delete)
-{
-     try {
-          # --BEHAVIOR-- adminBeforePageDelete
-          $core->callBehavior('adminBeforePageDelete',$post_id);
-          $core->blog->delPost($post_id);
-          http::redirect($p_url);
-     } catch (Exception $e) {
-          $core->error->add($e->getMessage());
      }
 }