diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2008-12-12 01:46:43 +0000 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2008-12-12 01:46:43 +0000 |
| commit | b202816324c3a6bf515a8d938c33e882106f26da (patch) | |
| tree | 0bbe5fc57440cb7446c84e3e2167185d85c527bf /core | |
| parent | 35067cbced6dadbc4cb7e7a45334485320eb473b (diff) | |
Remove the attempt at a local import module
Diffstat (limited to 'core')
| -rw-r--r-- | core/controllers/welcome.php | 6 | ||||
| -rw-r--r-- | core/views/welcome.html.php | 7 |
2 files changed, 0 insertions, 13 deletions
diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php index 3f70e1dc..b5215a02 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("local_import")) { - $this->template->local_import_html = $this->_get_local_import_html(); - } else { - $this->template->local_import_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->local_import_html = ""; } $this->_load_user_info(); diff --git a/core/views/welcome.html.php b/core/views/welcome.html.php index d412d119..360dc1ec 100644 --- a/core/views/welcome.html.php +++ b/core/views/welcome.html.php @@ -157,9 +157,6 @@ <?= html::script("lib/jquery.form.js") ?> <?= html::script("lib/jquery.cookie.js") ?> <?= html::script("lib/jquery.MultiFile.js") ?> - <? if (class_exists("local_import_block")): ?> - <?= local_import_block::head(null) ?> - <? endif ?> <? if (class_exists("rearrange_block")): ?> <?= rearrange_block::head(null) ?> <? endif ?> @@ -264,10 +261,6 @@ </p> <?= $add_photo_html ?> <fieldset> - <legend>Local Server Import Admininstration</legend> - <?= $local_import_html ?> - </fieldset> - <fieldset> <legend>Server Side Photos</legend> <form method="post" action="<?= url::site("welcome/add_photos") ?>"> <input type="submit" value="upload"/> |