Changeset 4794


Ignore:
Timestamp:
02/09/12 00:04:28 (3 months ago)
Author:
mattlevine
Message:

Merge branch 'master' of github.com:blueriver/MuraCMS

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/www/tasks/widgets/ckfinder/config.cfm

    r4720 r4794  
    318318 
    319319<cfset $ = application.serviceFactory.getBean("MuraScope").init(session.siteid)> 
     320<cfif (fileExists(expandPath($.siteConfig("includePath") & '/js/finder/config.cfm') ) )> 
     321     <cfinclude template="#$.siteConfig('includePath')#/js/finder/config.cfm"> 
     322</cfif> 
    320323<cfif (fileExists(expandPath($.siteConfig("themeIncludePath") & '/js/finder/config.cfm') ) )> 
    321      <cfinclude template="#$.siteConfig('themeAssetPath')#/js/finder/config.cfm"> 
     324     <cfinclude template="#$.siteConfig('themeIncludePath')#/js/finder/config.cfm"> 
    322325</cfif> 
Note: See TracChangeset for help on using the changeset viewer.