mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-29 10:38:08 +01:00
Code Issues Releases Wiki Activity

EONE-11 (Bug): fixing install routine (again)

Browse Source
This commit is contained in:
secretr 2010-03-16 13:04:23 +00:00
parent 8ca9a28215
commit 14c3a17ac8
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
e107_handlers/e107_class.php
View File

@ -355,13 +355,14 @@ class e107
*
* @return e107
*/
public function initInstall($e107_paths, $e107_root_path)
public function initInstall($e107_paths, $e107_root_path, $e107_config_override = array())
{
// Do some security checks/cleanup, prepare the environment
$this->prepare_request();
// folder info
$this->e107_dirs = $e107_paths;
//$this->e107_dirs = $e107_paths;
$this->setDirs($e107_paths, $e107_config_override);
// build all paths
$this->set_paths();
@ -1106,7 +1107,7 @@ class e107
{
return self::getSingleton('comment', true);
}
/**
* Retrieve Media handler singleton object
* @return comment

41
install_.php
View File

@ -8,10 +8,8 @@
*
* Installation file
*
* $Source: /cvs_backup/e107_0.8/install_.php,v $
* $Revision$
* $Date$
* $Author$
* $URL$
* $Id$
*
*/
@ -33,22 +31,24 @@ define('MAKE_INSTALL_LOG', TRUE);
/* Default Options and Paths for Installer */
$MySQLprefix = 'e107_';
$HANDLERS_DIRECTORY = "e107_handlers/"; // needed for e107 class init
$ADMIN_DIRECTORY = "e107_admin/";
$FILES_DIRECTORY = "e107_files/";
$IMAGES_DIRECTORY = "e107_images/";
$MEDIA_DIRECTORY = "e107_media/";
$THEMES_DIRECTORY = "e107_themes/";
$PLUGINS_DIRECTORY = "e107_plugins/";
$HANDLERS_DIRECTORY = "e107_handlers/";
$LANGUAGES_DIRECTORY = "e107_languages/";
$HELP_DIRECTORY = "e107_docs/help/";
$CACHE_DIRECTORY = "e107_system/cache/";
$DOWNLOADS_DIRECTORY = "e107_media/files/";
$UPLOADS_DIRECTORY = "e107_media/temp/";
$LOGS_DIRECTORY = "e107_files/logs";
$CORE_DIRECTORY = "e107_core/";
$SYSTEM_DIRECTORY = "e107_system/";
// Should be safe to disable this - done in e107 class
//$ADMIN_DIRECTORY = "e107_admin/";
//$FILES_DIRECTORY = "e107_files/";
//$IMAGES_DIRECTORY = "e107_images/";
//$MEDIA_DIRECTORY = "e107_media/";
//$THEMES_DIRECTORY = "e107_themes/";
//$PLUGINS_DIRECTORY = "e107_plugins/";
//$HANDLERS_DIRECTORY = "e107_handlers/";
//$LANGUAGES_DIRECTORY = "e107_languages/";
//$HELP_DIRECTORY = "e107_docs/help/";
//$CACHE_DIRECTORY = "e107_system/cache/";
//$DOWNLOADS_DIRECTORY = "e107_media/files/";
//$UPLOADS_DIRECTORY = "e107_media/temp/";
//$LOGS_DIRECTORY = "e107_files/logs";
//$CORE_DIRECTORY = "e107_core/";
//$SYSTEM_DIRECTORY = "e107_system/";
/* End configurable variables */
@ -155,7 +155,8 @@ function check_class($whatever)
}
$e107_paths = compact('ADMIN_DIRECTORY', 'FILES_DIRECTORY', 'IMAGES_DIRECTORY', 'THEMES_DIRECTORY', 'PLUGINS_DIRECTORY', 'HANDLERS_DIRECTORY', 'LANGUAGES_DIRECTORY', 'HELP_DIRECTORY', 'CACHE_DIRECTORY', 'DOWNLOADS_DIRECTORY', 'UPLOADS_DIRECTORY', 'MEDIA_DIRECTORY', 'LOGS_DIRECTORY', 'SYSTEM_DIRECTORY', 'CORE_DIRECTORY');
//$e107_paths = compact('ADMIN_DIRECTORY', 'FILES_DIRECTORY', 'IMAGES_DIRECTORY', 'THEMES_DIRECTORY', 'PLUGINS_DIRECTORY', 'HANDLERS_DIRECTORY', 'LANGUAGES_DIRECTORY', 'HELP_DIRECTORY', 'CACHE_DIRECTORY', 'DOWNLOADS_DIRECTORY', 'UPLOADS_DIRECTORY', 'MEDIA_DIRECTORY', 'LOGS_DIRECTORY', 'SYSTEM_DIRECTORY', 'CORE_DIRECTORY');
$e107_paths = array();
$e107 = e107::getInstance();
$e107->initInstall($e107_paths, realpath(dirname(__FILE__)));
unset($e107_paths);