diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/controllers/welcome.php | 4 | ||||
| -rw-r--r-- | core/views/welcome.html.php | 5 |
2 files changed, 5 insertions, 4 deletions
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 = ""; } diff --git a/core/views/welcome.html.php b/core/views/welcome.html.php index 075a485a..d41b81c2 100644 --- a/core/views/welcome.html.php +++ b/core/views/welcome.html.php @@ -157,9 +157,12 @@ <?= html::script("lib/jquery.form.js") ?> <?= html::script("lib/jquery.cookie.js") ?> <?= html::script("lib/jquery.MultiFile.js") ?> - <? if (class_exists("rearrange_block")): ?> + <? if (module::is_installed("rearrange")): ?> <?= rearrange_block::head(null) ?> <? endif ?> + <? if (module::is_installed("watermark")): ?> + <?= watermark_block::head(null) ?> + <? endif ?> </head> <body> <div class="outer"> |