Permalink
Browse files

Fixing issue with dspPrimaryNav(displayHome='conditional') #362 and a…

…dding missing query credentials.
  • Loading branch information...
1 parent 4f5fe64 commit 06214ebd2fcf0ef0052e7d6a62a28e57bb914d0e @mattlevine mattlevine committed Apr 28, 2012
View
2 requirements/mura/content/contentGateway.cfc
@@ -1842,7 +1842,7 @@ version 2 without this exception. You may, if you choose, apply this exception
<cfset var rspre="">
<cfset var rs="">
- <cfquery name="rspre" datasource="#variables.configBean.getDatasource()#">
+ <cfquery name="rspre" datasource="#variables.configBean.getReadOnlyDatasource()#" username="#variables.configBean.getReadOnlyDbUsername()#" password="#variables.configBean.getReadOnlyDbPassword()#">
select
parentID,
<cfif variables.configBean.getDbTYpe() neq 'oracle'>
View
2 requirements/mura/content/contentRenderer.cfc
@@ -1801,7 +1801,7 @@ version 2 without this exception. You may, if you choose, apply this exception
<cfset link=addlink(argumentCollection=linkArgs)>
</cfsilent>
- <cfif not homeDisplayed and currDepth eq 1 and (arguments.displayHome eq "Always" or (arguments.displayHome eq "Conditional" and event.getValue('contentBean').getcontentid() neq "00000000000000000000000000000000001" and listFind(itemClass,"first"," ")))>
+ <cfif not homeDisplayed and currDepth eq 1 and (arguments.displayHome eq "Always" or (arguments.displayHome eq "Conditional" and event.getValue('contentBean').getcontentid() neq "00000000000000000000000000000000001"))>
<cfsilent>
<cfquery name="rsHome" datasource="#application.configBean.getReadOnlyDatasource()#" username="#application.configBean.getReadOnlyDbUsername()#" password="#application.configBean.getReadOnlyDbPassword()#">
select menutitle,filename from tcontent where contentID=<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.contentID#"> and siteid=<cfqueryparam cfsqltype="cf_sql_varchar" value="#event.getValue('siteID')#"> and active=1
View
2 requirements/mura/permission.cfc
@@ -619,7 +619,7 @@ username="#variables.configBean.getDBUsername()#" password="#variables.configBea
<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.data.siteid#"/>
)</cfquery>
- <cfquery name="rs" datasource="#variables.configBean.getDatasource()#">
+ <cfquery name="rs" datasource="#variables.configBean.getDatasource()#" username="#variables.configBean.getDBUsername()#" password="#variables.configBean.getDBPassword()#">
select * from tpermissions where groupid='#arguments.data.groupid#'
</cfquery>

0 comments on commit 06214eb

Please sign in to comment.