richard
/
sorbetcms
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Fixed a bug with a duplicated constants.

master
Victor De la Rocha 2008-10-24 06:22:07 +00:00
parent 918668ccb5
commit 77cb58b951
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/install.class.php
View File

@ -49,7 +49,7 @@ class Install {
} }
function install_db(){ function install_db(){
require('config.php'); require_once(Absolute_Path.'config.php');
$db = new Conexion_Mysql(DB_name, DB_Server, DB_User, DB_Password); $db = new Conexion_Mysql(DB_name, DB_Server, DB_User, DB_Password);
$sqlStr = array(); $sqlStr = array();
@ -158,7 +158,7 @@ class Install {
function is_gelato_installed(){ function is_gelato_installed(){
if(file_exists(Absolute_Path.'config.php')) { if(file_exists(Absolute_Path.'config.php')) {
@include(Absolute_Path."config.php"); include_once(Absolute_Path."config.php");
if (!$this->check_for_config()){ if (!$this->check_for_config()){
return false; return false;
} else { } else {

17
entry.php
View File

@ -28,7 +28,6 @@ ob_start();
error_reporting (E_ALL); error_reporting (E_ALL);
ini_set('display_errors', '1'); ini_set('display_errors', '1');
// PHP settings specific to Gelato // PHP settings specific to Gelato
ini_set('pcre.backtrack_limit', '10000'); ini_set('pcre.backtrack_limit', '10000');
// Globals to be used throughout the application // Globals to be used throughout the application
@ -41,9 +40,9 @@ $dir = (strpos($_SERVER['REQUEST_URI'],'/admin')) ? "../" : "";
if (!file_exists($configFile) and basename($_SERVER['PHP_SELF'])!='install.php'){ if (!file_exists($configFile) and basename($_SERVER['PHP_SELF'])!='install.php'){
header("Location: {$dir}install.php"); header("Location: {$dir}install.php");
exit; exit;
} else { } else {
include(Absolute_Path.'classes/install.class.php'); include_once(Absolute_Path.'classes/install.class.php');
$install = new Install(); $install = new Install();
if(!$install->is_gelato_installed()){ if(!$install->is_gelato_installed()){
if(basename($_SERVER['PHP_SELF'])!='install.php'){ if(basename($_SERVER['PHP_SELF'])!='install.php'){
header("Location: {$dir}install.php");exit; header("Location: {$dir}install.php");exit;
@ -53,7 +52,7 @@ if (!file_exists($configFile) and basename($_SERVER['PHP_SELF'])!='install.php')
} }
if($installed) { if($installed) {
require($configFile); require_once($configFile);
} }
require_once("classes/configuration.class.php"); require_once("classes/configuration.class.php");
@ -76,11 +75,11 @@ if($installed){
$tumble = new gelato(); $tumble = new gelato();
$conf = new configuration(); $conf = new configuration();
$db = new Conexion_Mysql(DB_name, DB_Server, DB_User, DB_Password); $db = new Conexion_Mysql(DB_name, DB_Server, DB_User, DB_Password);
session_start(); session_start();
$feeds = new feeds(); $feeds = new feeds();
$feeds->updateFeeds(); $feeds->updateFeeds();
unset($feeds); unset($feeds);
} }
?> ?>