Fix for install script pre-db

reubenbrown13 · Jul 28, 2011 · 225632a · 225632a
1 parent 2751512
commit 225632a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Application.cfm b/Application.cfm
@@ -63,7 +63,6 @@
 			<cfset application.config = createObject("component","cfcs.config").init(settings)>
 			<cfset application.diff = createObject("component","cfcs.diff").init()>
 			<cfset application.file = createObject("component","cfcs.file").init(settings)>
-			<cfset application.gCal = createObject("component", "cfcs.GoogleCalendar").init(settings.googlecal_user,settings.googlecal_pass,settings.googlecal_offset)>
 			<cfset application.issue = createObject("component","cfcs.issue").init(settings)>
 			<cfset application.message = createObject("component","cfcs.message").init(settings)>
 			<cfset application.milestone = createObject("component","cfcs.milestone").init(settings)>
@@ -78,6 +77,11 @@
 			<cfset application.todo = createObject("component","cfcs.todo").init(settings)>
 			<cfset application.todolist = createObject("component","cfcs.todolist").init(settings)>
 			<cfset application.user = createObject("component","cfcs.user").init(settings)>
+			<!--- Google Calendar --->
+			<cftry>
+				<cfset application.gCal = createObject("component", "cfcs.GoogleCalendar").init(settings.googlecal_user,settings.googlecal_pass,settings.googlecal_offset)>
+				<cfcatch></cfcatch>
+			</cftry>
 
 			<!--- DataMgr --->
 			<cftry>

diff --git a/templates/main_header.cfm b/templates/main_header.cfm
@@ -55,7 +55,10 @@
 		</cfif>
 		<h1>#attributes.project#</h1>
 	<cfelse>
-		<h1>#application.settings.app_title#</h1>
+		<cftry>
+			<h1>#application.settings.app_title#</h1>
+			<cfcatch><h1>Project Tracker</h1></cfcatch>
+		</cftry>
 	</cfif>
 
 	<cfif session.user.projects.recordCount gt 1>