From db7e60da32e3feba918cc819a1ef8fada6aec02a Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Sun, 14 Dec 2008 23:53:30 +0000 Subject: Change the watermark module to use forge. Also the watermark file is now stored in varpath. and the location is stored in the module vars table --- core/controllers/welcome.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'core/controllers') diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php index 3b00a1b8..9e6f9542 100644 --- a/core/controllers/welcome.php +++ b/core/controllers/welcome.php @@ -36,9 +36,7 @@ class Welcome_Controller extends Template_Controller { $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(); - $this->template->add_watermark_html = new View("watermark_add_form.html"); - $this->template->add_watermark_html->fields = array("file" => ""); + $this->template->add_watermark_html = $this->_get_add_watermark_html(); } else { $this->template->add_watermark_html = ""; } -- cgit v1.2.3