Index: root/projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/search/advsearch.get.js =================================================================== --- root/projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/search/advsearch.get.js (revision 72986) +++ root/projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/search/advsearch.get.js (working copy) @@ -56,7 +56,7 @@ // Prepare the model var repoconfig = config.scoped['Search']['search'].getChildValue('repository-search'); // config override can force repository search on/off - model.searchRepo = (repoconfig != "none"); + model.searchRepo = ((page.url.templateArgs["site"] == null) || repoconfig == "always") && repoconfig != "none"; model.siteId = siteId; model.searchForms = searchForms; Index: root/projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/search/search.get.html.ftl =================================================================== --- root/projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/search/search.get.html.ftl (revision 72986) +++ root/projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/search/search.get.html.ftl (working copy) @@ -18,7 +18,7 @@ <#assign el=args.htmlid> <#assign searchconfig=config.scoped['Search']['search']>