From 1ae3ed7e3b796bae6e16e687c29f3fcf0df5fbfe Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 4 Dec 2008 06:36:14 +0000
Subject: Get rid of the rearrange helper as the code could be inlined

---
 core/controllers/welcome.php                |  2 +-
 modules/rearrange/controllers/rearrange.php | 13 +++++++++-
 modules/rearrange/helpers/rearrange.php     | 40 -----------------------------
 3 files changed, 13 insertions(+), 42 deletions(-)
 delete mode 100644 modules/rearrange/helpers/rearrange.php

diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php
index 99797d2a..7730d254 100644
--- a/core/controllers/welcome.php
+++ b/core/controllers/welcome.php
@@ -36,7 +36,7 @@ class Welcome_Controller extends Template_Controller {
       $this->template->deepest_photo = ORM::factory("item")
         ->where("type", "photo")->orderby("level", "desc")->find();
       $this->template->album_tree = $this->_load_album_tree();
-      $this->template->rearrange_html = rearrange::get_html()->render();
+      $this->template->rearrange_html = new View("rearrange.html");
     } catch (Exception $e) {
       $this->template->album_count = 0;
       $this->template->photo_count = 0;
diff --git a/modules/rearrange/controllers/rearrange.php b/modules/rearrange/controllers/rearrange.php
index 0bb5f48c..ef95a256 100644
--- a/modules/rearrange/controllers/rearrange.php
+++ b/modules/rearrange/controllers/rearrange.php
@@ -20,6 +20,17 @@
 class Rearrange_Controller extends Controller {
 
   public function show($id=null) {
-    print rearrange::get_children($id)->render();
+    $view = new View("rearrange_item_list.html");
+
+    $view->root = null;
+    if (empty($id)) {
+      $item = ORM::factory("item", 1);
+      $view->children = array($item);
+    } else {
+      $item = ORM::factory("item", $id);
+      $view->children = $item->children();
+    }
+
+    print $view;
   }
 }
\ No newline at end of file
diff --git a/modules/rearrange/helpers/rearrange.php b/modules/rearrange/helpers/rearrange.php
deleted file mode 100644
index 558899b2..00000000
--- a/modules/rearrange/helpers/rearrange.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class rearrange_Core {
-  public static function get_html() {
-    return new View("rearrange.html");
-  }
-
-  public static function get_children($id=null) {
-    $view = new View("rearrange_item_list.html");
-
-    $view->root = null;
-    if (empty($id)) {
-      $item = ORM::factory("item", 1);
-      $view->children = array($item);
-    } else {
-      $item = ORM::factory("item", $id);
-      $view->children = $item->children();
-    }
-
-    return $view;
-  }
-
-}
-- 
cgit v1.2.3