1 files changed, 3 insertions, 10 deletions
diff --git a/core/helpers/core_event.php b/core/helpers/core_event.php
index c9e4e743..d1869360 100644
--- a/core/helpers/core_event.php
+++ b/core/helpers/core_event.php
@@ -44,19 +44,12 @@ class core_event_Core {
       ->in("id", $event_parms->itemids[0])
       ->find();
 
-    $generalPane = new View("organize_edit_general.html");
-    $generalPane->item = $item;
-
     $event_parms->panes[] = array("label" => $item->is_album() ? t("Edit Album") : t("Edit Photo"),
-                                  "content" => $generalPane);
+                                  "content" => core_organize::getGeneralEditForm($item));
 
     if ($item->is_album()) {
-      $sortPane = new View("organize_edit_sort.html");
-      $sortPane->sort_by = $item->sort_column;
-      $sortPane->sort_order =
-        empty($item->sort_order) || $item->sort_order == "ASC" ? t("Ascending") : t("Descending");
-
-      $event_parms->panes[] = array("label" => t("Sort Order"),  "content" => $sortPane);
+      $event_parms->panes[] = array("label" => t("Sort Order"),
+                                    "content" => core_organize::getSortEditForm($item));
     }
   }