From a23d845054a84a33ce2ba71086f10466af58b3c1 Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Sun, 16 Dec 2012 13:02:19 -0800
Subject: [PATCH] Files directory no longer created during install. ( Issue #45
 )

---
 e107_handlers/e107_class.php    | 4 ++--
 e107_handlers/e_parse_class.php | 2 +-
 install_.php                    | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index b67b4edb3..7e6b11531 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -437,7 +437,7 @@ class e107
 		
 		$ret['WEB_CSS_DIRECTORY'] 			= $ret['WEB_DIRECTORY'].'css/';
 		$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['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_CSS', $this->get_override_rel('WEB_CSS'));
 			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_CONTENT', $this->get_override_rel('CACHE_CONTENT'));
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 409ae92e0..b907ba1c1 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -2129,7 +2129,7 @@ class e_parse
 					'{e_WEB_JS}'		=> $e107->getFolder('web_js'),
 					'{e_WEB_CSS}'		=> $e107->getFolder('web_css'),
 					'{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_PLUGIN}'	=> $e107->getFolder('plugins'),
diff --git a/install_.php b/install_.php
index 92153a6b7..fd2587114 100644
--- a/install_.php
+++ b/install_.php
@@ -384,6 +384,7 @@ class e_install
 		$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->logLine('Stage 1 completed');
+		
 	}
 
 
@@ -471,9 +472,12 @@ class e_install
 		
 		$this->previous_steps['paths']['hash'] = $hash;
 
+		$omit = array('FILES_DIRECTORY','WEB_IMAGES_DIRECTORY');
 		
 		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]);
 					
 			if(!is_dir($this->e107->e107_dirs[$dir]))