summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inc/media.php6
-rw-r--r--lib/scripts/media.js1
2 files changed, 4 insertions, 3 deletions
diff --git a/inc/media.php b/inc/media.php
index 79e9a7a7e..43d8539c4 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -619,18 +619,18 @@ function media_uploadform($ns, $auth){
'O_sectok' => getSecurityToken(),
'O_authtok' => auth_createToken(),
);
- $var = buildURLparams($opt,'&');
+ $var = buildURLparams($opt);
// output the flash uploader
?>
<div id="dw__flashupload" style="display:none">
<div class="upload"><?php echo $lang['mu_intro']?></div>
<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="100%" height="100%"
codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab">
- <param name="movie" value="multipleUpload.swf?t=<?=time()?>" />
+ <param name="movie" value="multipleUpload.swf?t=<?php echo time()?>" />
<param name="quality" value="high" />
<param name="bgcolor" value="#ffffff" />
<param name="FlashVars" value="<?php echo $var?>" />
- <embed src="multipleUpload.swf?t=<?=time()?>" quality="high" bgcolor="#ffffff"
+ <embed src="multipleUpload.swf?t=<?php echo time()?>" quality="high" bgcolor="#ffffff"
width="100%" height="100%" name="fileUpload" align="middle"
play="true" loop="false" quality="high" FlashVars="<?php echo $var?>"
allowScriptAccess="sameDomain"
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index ebfd01322..7d0c78730 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -209,6 +209,7 @@ media = {
ajax.afterCompletion = function(){
media.selectorattach(content);
media.updatehide();
+ media.initFlashUpload();
};
ajax.runAJAX(link.search.substr(1)+'&call=medialist');
return false;