summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorFabio Bas <ctrlaltca@gmail.com>2013-12-02 19:02:07 +0100
committerFabio Bas <ctrlaltca@gmail.com>2014-08-23 12:11:51 +0200
commiteb9269193cd9b2a50050460c5807652f38ae52ee (patch)
tree72078790430df4f71fee51666984cf6d987dc625 /framework
parent0f44c9bfdf9258dc9feb61613f46b438d7ff0027 (diff)
Avoid rendering <script> blocks in callbacks
Diffstat (limited to 'framework')
-rw-r--r--framework/Web/UI/TClientScriptManager.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/framework/Web/UI/TClientScriptManager.php b/framework/Web/UI/TClientScriptManager.php
index c9c9c725..2a8ae6ae 100644
--- a/framework/Web/UI/TClientScriptManager.php
+++ b/framework/Web/UI/TClientScriptManager.php
@@ -715,8 +715,11 @@ class TClientScriptManager extends TApplicationComponent
*/
public function flushScriptFiles($writer, $control=null)
{
- $this->_page->ensureRenderInForm($control);
- $this->renderAllPendingScriptFiles($writer);
+ if(!$this->_page->getIsCallback())
+ {
+ $this->_page->ensureRenderInForm($control);
+ $this->renderAllPendingScriptFiles($writer);
+ }
}
/**