From ba02a631c9aa96d433b0546c071e3291f891b88a Mon Sep 17 00:00:00 2001 From: Andrew O'Neil Date: Tue, 2 Oct 2007 04:56:43 +0000 Subject: [PATCH] Added better checking for wonky databases (merged from 2.1.0 branch, r42589) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42924 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/control/Controller.php | 6 +++--- filesystem/Folder.php | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/control/Controller.php b/core/control/Controller.php index f84e0b8d2..5624e1910 100644 --- a/core/control/Controller.php +++ b/core/control/Controller.php @@ -271,15 +271,15 @@ class Controller extends ViewableData { */ function init() { // Test and development sites should be secured, via basic-auth - if(ClassInfo::ready() && ClassInfo::hasTable("Member") && Director::isTest() && $this->basicAuthEnabled) { + if(ClassInfo::hasTable("Group") && ClassInfo::hasTable("Member") && Director::isTest() && $this->basicAuthEnabled) { BasicAuth::requireLogin("SilverStripe test website. Use your CMS login", "ADMIN"); } // Cookie::set("PastVisitor", true); - // ClassInfo::ready() called to ensure that we're not in a very-first-setup stage - if(ClassInfo::ready() && ClassInfo::hasTable("Member") && ($member = Member::currentUser())) { + // ClassInfo::hasTable() called to ensure that we're not in a very-first-setup stage + if(ClassInfo::hasTable("Group") && ClassInfo::hasTable("Member") && ($member = Member::currentUser())) { Cookie::set("PastMember", true); DB::query("UPDATE Member SET LastVisited = NOW() WHERE ID = $member->ID", null); } diff --git a/filesystem/Folder.php b/filesystem/Folder.php index 2293b445c..f8a09f264 100755 --- a/filesystem/Folder.php +++ b/filesystem/Folder.php @@ -168,6 +168,7 @@ class Folder extends File { } if(Member::currentUser()) $ownerID = Member::currentUser()->ID; + else $ownerID = 0; $filename = addslashes($this->Filename . $name); if($className == 'Folder' ) $filename .= '/';