summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-08-30 19:25:56 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-08-30 19:25:56 +0000
commit2a17cf4806caf64ee5ed71ccc741f21a4e767288 (patch)
tree82ab98f99ca3733c6e7234467736c00297830177
parent85020546bdb156e7f9eefd4294f691b9a1ee1cd5 (diff)
downloadampache-2a17cf4806caf64ee5ed71ccc741f21a4e767288.tar.gz
ampache-2a17cf4806caf64ee5ed71ccc741f21a4e767288.tar.bz2
ampache-2a17cf4806caf64ee5ed71ccc741f21a4e767288.zip
fixed an old reference to conf
-rw-r--r--templates/show_login_form.inc2
-rw-r--r--update.php22
2 files changed, 6 insertions, 18 deletions
diff --git a/templates/show_login_form.inc b/templates/show_login_form.inc
index c4599821..3068dd5d 100644
--- a/templates/show_login_form.inc
+++ b/templates/show_login_form.inc
@@ -60,7 +60,7 @@ function focus(){ document.login.username.focus(); }
</form>
<?php if (Config::get('allow_public_registration')) { ?>
<span class="text-action">
- <a href="<?php echo conf('web_path'); ?>/register.php"><?php echo _('Register'); ?></a>
+ <a href="<?php echo Config::get('web_path'); ?>/register.php"><?php echo _('Register'); ?></a>
</span>
<?php } // end if (conf('allow_public_registration')) ?>
</div>
diff --git a/update.php b/update.php
index 031df731..e236e3c5 100644
--- a/update.php
+++ b/update.php
@@ -18,24 +18,12 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-/*!
- @header Update Document
- This document handles updating from one version of Maintain to the next
- if this doc is readable you can't login. stop.update and gone.fishing
- must also be in place for this doc to work.
+// We need this stuff
+define('NO_SESSION','1');
+require 'lib/init.php';
-*/
-
-/* Start House Keeping */
-
- // We need this stuff
- define('NO_SESSION','1');
- require 'lib/init.php';
-
- // Get the version and format it
- $version = Update::get_version();
-
-/* End House Keeping */
+// Get the version and format it
+$version = Update::get_version();
if ($_REQUEST['action'] == 'update') {