mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 14:46:56 +02:00
Code Issues Releases Wiki Activity

Files directory no longer created during install. ( Issue #45 )

Browse Source
This commit is contained in:
Cameron
2012-12-16 13:02:19 -08:00
parent bf8d7bdbc1
commit a23d845054
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_handlers/e107_class.php
View File

@@ -437,7 +437,7 @@ class e107
$ret['WEB_CSS_DIRECTORY'] = $ret['WEB_DIRECTORY'].'css/'; $ret['WEB_CSS_DIRECTORY'] = $ret['WEB_DIRECTORY'].'css/';
$ret['WEB_IMAGES_DIRECTORY'] = $ret['WEB_DIRECTORY'].'images/'; $ret['WEB_IMAGES_DIRECTORY'] = $ret['WEB_DIRECTORY'].'images/';
$ret['WEB_PACKS_DIRECTORY'] = $ret['WEB_DIRECTORY'].'packages/'; // $ret['WEB_PACKS_DIRECTORY'] = $ret['WEB_DIRECTORY'].'packages/';
$ret['DOWNLOADS_DIRECTORY'] = $ret['MEDIA_FILES_DIRECTORY']; $ret['DOWNLOADS_DIRECTORY'] = $ret['MEDIA_FILES_DIRECTORY'];
$ret['UPLOADS_DIRECTORY'] = $ret['MEDIA_UPLOAD_DIRECTORY']; $ret['UPLOADS_DIRECTORY'] = $ret['MEDIA_UPLOAD_DIRECTORY'];
@@ -2692,7 +2692,7 @@ class e107
define('e_WEB_JS', $this->get_override_rel('WEB_JS')); define('e_WEB_JS', $this->get_override_rel('WEB_JS'));
define('e_WEB_CSS', $this->get_override_rel('WEB_CSS')); define('e_WEB_CSS', $this->get_override_rel('WEB_CSS'));
define('e_WEB_IMAGE', $this->get_override_rel('WEB_IMAGES')); define('e_WEB_IMAGE', $this->get_override_rel('WEB_IMAGES'));
define('e_WEB_PACK', $this->get_override_rel('WEB_PACKS')); // define('e_WEB_PACK', $this->get_override_rel('WEB_PACKS'));
define('e_CACHE', $this->get_override_rel('CACHE')); define('e_CACHE', $this->get_override_rel('CACHE'));
define('e_CACHE_CONTENT', $this->get_override_rel('CACHE_CONTENT')); define('e_CACHE_CONTENT', $this->get_override_rel('CACHE_CONTENT'));

2
e107_handlers/e_parse_class.php
View File

@@ -2129,7 +2129,7 @@ class e_parse
'{e_WEB_JS}' => $e107->getFolder('web_js'), '{e_WEB_JS}' => $e107->getFolder('web_js'),
'{e_WEB_CSS}' => $e107->getFolder('web_css'), '{e_WEB_CSS}' => $e107->getFolder('web_css'),
'{e_WEB_IMAGE}' => $e107->getFolder('web_images'), '{e_WEB_IMAGE}' => $e107->getFolder('web_images'),
'{e_WEB_PACK}' => $e107->getFolder('web_packs'), // '{e_WEB_PACK}' => $e107->getFolder('web_packs'),
'{e_IMAGE}' => $e107->getFolder('images'), '{e_IMAGE}' => $e107->getFolder('images'),
'{e_PLUGIN}' => $e107->getFolder('plugins'), '{e_PLUGIN}' => $e107->getFolder('plugins'),

4
install_.php
View File

@@ -384,6 +384,7 @@ class e_install
$e_forms->add_button("start", LANINS_035); $e_forms->add_button("start", LANINS_035);
$this->template->SetTag("stage_content", "<div style='text-align: center;'><div class='alert alert-info alert-block'><label for='language'>".LANINS_005."</label></div>\n<br /><br /><br />\n".$e_forms->return_form()."</div>"); $this->template->SetTag("stage_content", "<div style='text-align: center;'><div class='alert alert-info alert-block'><label for='language'>".LANINS_005."</label></div>\n<br /><br /><br />\n".$e_forms->return_form()."</div>");
$this->logLine('Stage 1 completed'); $this->logLine('Stage 1 completed');
} }
@@ -471,9 +472,12 @@ class e_install
$this->previous_steps['paths']['hash'] = $hash; $this->previous_steps['paths']['hash'] = $hash;
$omit = array('FILES_DIRECTORY','WEB_IMAGES_DIRECTORY');
foreach($this->e107->e107_dirs as $dir => $p) foreach($this->e107->e107_dirs as $dir => $p)
{ {
if(in_array($dir, $omit)) { continue; }
$this->e107->e107_dirs[$dir] = str_replace("[hash]", $hash, $this->e107->e107_dirs[$dir]); $this->e107->e107_dirs[$dir] = str_replace("[hash]", $hash, $this->e107->e107_dirs[$dir]);
if(!is_dir($this->e107->e107_dirs[$dir])) if(!is_dir($this->e107->e107_dirs[$dir]))