summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/helpers/movie.php2
-rw-r--r--core/views/simple_uploader.html.php20
2 files changed, 11 insertions, 11 deletions
diff --git a/core/helpers/movie.php b/core/helpers/movie.php
index 5d64aa1f..9941fcee 100644
--- a/core/helpers/movie.php
+++ b/core/helpers/movie.php
@@ -108,7 +108,7 @@ class movie_Core {
return array($width, $height);
}
- function extract_frame($input_file, $output_file) {
+ static function extract_frame($input_file, $output_file) {
if (!$ffmpeg = exec("which ffmpeg")) {
throw new Exception("@todo MISSING_FFMPEG");
}
diff --git a/core/views/simple_uploader.html.php b/core/views/simple_uploader.html.php
index ed4fad08..fd06a72c 100644
--- a/core/views/simple_uploader.html.php
+++ b/core/views/simple_uploader.html.php
@@ -6,10 +6,10 @@
</fieldset>
<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
- id="SimpleUploader"
+ id="SimpleUploader"
width="470px"
height="400px"
- codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
+ codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
<param name="movie" value="<?= url::file("core/SimpleUploader.swf") ?>" />
<param name="flashVars" value="<?= $flash_vars ?>" />
<param name="quality" value="high" />
@@ -18,15 +18,15 @@
<embed src="<?= url::file("core/SimpleUploader.swf") ?>"
quality="high"
bgcolor="#ffffff"
- flashVars="<?= $flash_vars ?>"
- width="470" height="400" name="<?= url::file("core/SimpleUploader.swf") ?>"
+ flashVars="<?= $flash_vars ?>"
+ width="470" height="400" name="<?= url::file("core/SimpleUploader.swf") ?>"
align="middle"
- play="true"
- loop="false"
- quality="high"
- allowScriptAccess="sameDomain"
- type="application/x-shockwave-flash"
- pluginspage="http://www.adobe.com/go/getflashplayer">
+ play="true"
+ loop="false"
+ quality="high"
+ allowScriptAccess="sameDomain"
+ type="application/x-shockwave-flash"
+ pluginspage="http://www.adobe.com/go/getflashplayer">
</embed>
</object>