summaryrefslogtreecommitdiffstats
path: root/modules/init.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2005-12-31 07:50:45 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2005-12-31 07:50:45 +0000
commitfe4774127f292ce94ab79771bc72cbb7ca4db371 (patch)
treed8cba0fe9520260c86f8a7cbe9b06bc077780ce8 /modules/init.php
parent9e5afd340f0fd74c0da852be1f24cfe5285e38e8 (diff)
downloadampache-fe4774127f292ce94ab79771bc72cbb7ca4db371.tar.gz
ampache-fe4774127f292ce94ab79771bc72cbb7ca4db371.tar.bz2
ampache-fe4774127f292ce94ab79771bc72cbb7ca4db371.zip
fixed a mistake on the ratings, added it to artist and fixed location detection
Diffstat (limited to 'modules/init.php')
-rw-r--r--modules/init.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/modules/init.php b/modules/init.php
index 66927a5a..fa57c29e 100644
--- a/modules/init.php
+++ b/modules/init.php
@@ -37,7 +37,6 @@ $prefix = realpath($ampache_path . "/../");
$configfile = "$prefix/config/ampache.cfg.php";
require_once($prefix . "/lib/general.lib.php");
-
/*********************STOP EDITING*********************************/
/*
@@ -82,6 +81,7 @@ if (!$results['conf']['allow_stream_playback']) {
$results['conf']['allow_stream_playback'] = "true";
}
+$results['conf']['raw_web_path'] = $results['conf']['web_path'];
$results['conf']['web_path'] = $http_type . $_SERVER['HTTP_HOST'] . $results['conf']['web_path'];
$results['conf']['version'] = '3.3.2-Beta1 (Build 001)';
$results['conf']['catalog_file_pattern']= 'mp3|mpc|m4p|m4a|mp4|aac|ogg|rm|wma|asf|flac|spx';
@@ -208,15 +208,16 @@ require_once(conf('prefix') . "/lib/class/access.class.php");
require_once(conf('prefix') . "/lib/class/error.class.php");
require_once(conf('prefix') . "/lib/class/genre.class.php");
+
+/* Set a new Error Handler */
+$old_error_handler = set_error_handler("ampache_error_handler");
+
/* Some Libglue Hacks */
$array['dbh_name'] = 'stupid_pos';
$array['stupid_pos'] = check_sess_db('local');
libglue_param($array);
/* End Libglue Hacks */
-/* Set a new Error Handler */
-$old_error_handler = set_error_handler("ampache_error_handler");
-
/* Check their PHP Vars to make sure we're cool here */