1) Remove the load watermark from the scaffolding... use the menu option

2) The set watermark dialog is now sizing properly.  @todo is recenter in the window

1 files changed, 0 insertions, 10 deletions

diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php
index 5afe094e..7235e2c0 100644
--- a/core/controllers/welcome.php
+++ b/core/controllers/welcome.php
@@ -35,18 +35,12 @@ class Welcome_Controller extends Template_Controller {
         ->where("type", "photo")->orderby("level", "desc")->find();
       $this->template->album_tree = $this->_load_album_tree();
       $this->template->add_photo_html = $this->_get_add_photo_html();
-      if (module::is_installed("watermark")) {
-        $this->template->add_watermark_html = $this->_get_add_watermark_html();
-      } else {
-        $this->template->add_watermark_html = "";
-      }
     } catch (Exception $e) {
       $this->template->album_count = 0;
       $this->template->photo_count = 0;
       $this->template->deepest_photo = null;
       $this->template->album_tree = array();
       $this->template->add_photo_html = "";
-      $this->template->add_watermark_html = "";
     }
 
     $this->_load_user_info();
@@ -518,8 +512,4 @@ class Welcome_Controller extends Template_Controller {
     $parent = ORM::factory("item", $parent_id);
     return photo::get_add_form($parent);
   }
-
-  public function _get_add_watermark_html() {
-    return watermark::get_watermark_form();
-  }
 }