From 35cc365e61ace59856122d04982c0db220034714 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Mon, 16 Jul 2012 08:04:08 +0200 Subject: [PATCH] Removes unnecessary "sandbox=false" With WCF 2.0 "sandbox=false" is the default setting. --- com.woltlab.wcf/template/footer.tpl | 2 +- com.woltlab.wcf/template/header.tpl | 2 +- com.woltlab.wcf/template/permissionDenied.tpl | 9 ++++++--- com.woltlab.wcf/template/redirect.tpl | 10 +++++++--- com.woltlab.wcf/template/userException.tpl | 9 ++++++--- wcfsetup/install/files/acp/templates/footer.tpl | 2 +- 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/com.woltlab.wcf/template/footer.tpl b/com.woltlab.wcf/template/footer.tpl index e49c87a27b..7d11b60117 100644 --- a/com.woltlab.wcf/template/footer.tpl +++ b/com.woltlab.wcf/template/footer.tpl @@ -1,4 +1,4 @@ - {if $skipBreadcrumbs|empty}{include file='breadcrumbs' sandbox=false __microdata=false}{/if} + {if $skipBreadcrumbs|empty}{include file='breadcrumbs' __microdata=false}{/if} diff --git a/com.woltlab.wcf/template/header.tpl b/com.woltlab.wcf/template/header.tpl index 4aec40b794..9c8feace85 100644 --- a/com.woltlab.wcf/template/header.tpl +++ b/com.woltlab.wcf/template/header.tpl @@ -62,5 +62,5 @@
- {if $skipBreadcrumbs|empty}{include file='breadcrumbs' sandbox=false}{/if} + {if $skipBreadcrumbs|empty}{include file='breadcrumbs'}{/if} \ No newline at end of file diff --git a/com.woltlab.wcf/template/permissionDenied.tpl b/com.woltlab.wcf/template/permissionDenied.tpl index 10d7088864..972fe727fa 100644 --- a/com.woltlab.wcf/template/permissionDenied.tpl +++ b/com.woltlab.wcf/template/permissionDenied.tpl @@ -2,11 +2,13 @@ {lang}wcf.global.error.permissionDenied.title{/lang} - {lang}{PAGE_TITLE}{/lang} - {include file='headInclude' sandbox=false} + + {include file='headInclude'} -{include file='header' sandbox=false} + +{include file='header'}

{lang}wcf.global.error.permissionDenied{/lang}

@@ -18,6 +20,7 @@ --> {/if} -{include file='footer' sandbox=false} +{include file='footer'} + \ No newline at end of file diff --git a/com.woltlab.wcf/template/redirect.tpl b/com.woltlab.wcf/template/redirect.tpl index 231f3540c9..da71ff9d01 100644 --- a/com.woltlab.wcf/template/redirect.tpl +++ b/com.woltlab.wcf/template/redirect.tpl @@ -2,18 +2,22 @@ {lang}wcf.global.redirect.title{/lang} - {lang}{PAGE_TITLE}{/lang} - {include file='headInclude' sandbox=false} + + {include file='headInclude'} + -{include file='header' sandbox=false} + +{include file='header'}

{@$message}

{lang}wcf.global.redirect.url{/lang}
-{include file='footer' sandbox=false} +{include file='footer'} + \ No newline at end of file diff --git a/com.woltlab.wcf/template/userException.tpl b/com.woltlab.wcf/template/userException.tpl index 1d5785ece3..f2299a174e 100644 --- a/com.woltlab.wcf/template/userException.tpl +++ b/com.woltlab.wcf/template/userException.tpl @@ -1,11 +1,13 @@ {include file="documentHeader"} {lang}wcf.global.error.title{/lang} - {lang}{PAGE_TITLE}{/lang} - {include file='headInclude' sandbox=false} + + {include file='headInclude'} -{include file='header' sandbox=false} + +{include file='header'}

{@$message} @@ -26,6 +28,7 @@ --> {/if} -{include file='footer' sandbox=false} +{include file='footer'} + diff --git a/wcfsetup/install/files/acp/templates/footer.tpl b/wcfsetup/install/files/acp/templates/footer.tpl index c40f8a292f..13d35698e9 100644 --- a/wcfsetup/install/files/acp/templates/footer.tpl +++ b/wcfsetup/install/files/acp/templates/footer.tpl @@ -16,7 +16,7 @@

- {if PACKAGE_ID && ENABLE_BENCHMARK}{include file='benchmark' sandbox=false}{/if} + {if PACKAGE_ID && ENABLE_BENCHMARK}{include file='benchmark'}{/if}
Copyright © 2001-2012 WoltLab® GmbH
-- 2.20.1