From ac719c217c81ab3af3cf9d8dea15bd845d912ed9 Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 3 Mar 2008 13:00:31 +0000
Subject: Some further fixes

git-svn-id: https://code.elgg.org/elgg/trunk@55 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/elgglib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 53940a0fb..63ff62295 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -66,7 +66,7 @@
 		    }
 		
 		    // Load session and configuration variables
-		    if (is_array($_SESSION)) {
+		    if (is_array($_SESSION) && isset($_SESSION)) {
 		        $vars = array_merge($vars, $_SESSION);
 		    }
 			if (!empty($CONFIG))
@@ -105,7 +105,7 @@
 		    
 		    	if (!isset($CONFIG->views->locations[$view])) {
 		    		if (!isset($CONFIG->viewpath)) {
-						$location = dirname(dirname(dirname(__FILE__))) . "views/";		    			
+						$location = dirname(dirname(dirname(__FILE__))) . "/views/";		    			
 		    		} else {
 		    			$location = $CONFIG->viewpath;
 		    		}
@@ -242,7 +242,7 @@
 			}
 
 			if (!file_exists(dirname(dirname(dirname(__FILE__))) . "/.htaccess")) {
-				if (!copy(dirname(dirname(dirname(__FILE__))) . "/htaccess_dist", dirname(dirname(dirname(__FILE__))) . "/.htaccess")) {
+				if (!@copy(dirname(dirname(dirname(__FILE__))) . "/htaccess_dist", dirname(dirname(dirname(__FILE__))) . "/.htaccess")) {
 					register_error(elgg_view("messages/sanitisation/htaccess"));
 					$sanitised = false;
 				}
-- 
cgit v1.2.3