Merge remote-tracking branch 'origin/master'

2012-06-17 23:05:26 +02:00 · 2012-06-17 23:05:26 +02:00 · 17f64f0cc2
commit 17f64f0cc2
parent d4b516b33f 547282a240
1 changed files with 1 additions and 0 deletions
--- a/libraries/Scripts.class.php
+++ b/libraries/Scripts.class.php
@ -153,6 +153,7 @@ class PMA_Scripts
        foreach ($this->_files as $file) {
            $retval .= $this->_includeFile(
                $file['filename'],
+                $file['timestamp'],
                $file['conditional_ie']
            );
        }