Gilles has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/353505 )
Change subject: Fix X-Content-Dimensions support
......................................................................
Fix X-Content-Dimensions support
In the context of getContentHeaders(), the metadata is already unserialized now
Bug: T150741
Change-Id: Iedf24e31c62152936c852389d1cdb4e1daac068f
---
M handlers/OggHandler/OggHandler.php
M handlers/WebMHandler/WebMHandler.php
2 files changed, 12 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/05/353505/1
diff --git a/handlers/OggHandler/OggHandler.php
b/handlers/OggHandler/OggHandler.php
index 83a3263..b8de651 100644
--- a/handlers/OggHandler/OggHandler.php
+++ b/handlers/OggHandler/OggHandler.php
@@ -144,7 +144,7 @@
*
* @param $file File
* @param $path string
- * @param $metadata bool
+ * @param $metadata bool|string|array
* @return array|bool
*/
function getImageSize( $file, $path, $metadata = false ) {
@@ -153,7 +153,11 @@
if ( $metadata === false ) {
$metadata = $file->getMetadata();
}
- $metadata = $this->unpackMetadata( $metadata );
+
+ if ( is_string( $metadata ) ) {
+ $metadata = $this->unpackMetadata( $metadata );
+ }
+
if ( isset( $metadata['error'] ) || !isset(
$metadata['streams'] ) ) {
return false;
}
diff --git a/handlers/WebMHandler/WebMHandler.php
b/handlers/WebMHandler/WebMHandler.php
index f7b89cb..88be5fa 100644
--- a/handlers/WebMHandler/WebMHandler.php
+++ b/handlers/WebMHandler/WebMHandler.php
@@ -19,7 +19,7 @@
* Get the "media size"
* @param $file File
* @param $path string
- * @param $metadata bool
+ * @param $metadata bool|string|array
* @return array|bool
*/
function getImageSize( $file, $path, $metadata = false ) {
@@ -27,7 +27,11 @@
if ( $metadata === false ) {
$metadata = $file->getMetadata();
}
- $metadata = $this->unpackMetadata( $metadata );
+
+ if ( is_string( $metadata ) ) {
+ $metadata = $this->unpackMetadata( $metadata );
+ }
+
if ( isset( $metadata['error'] ) ) {
return false;
}
--
To view, visit https://gerrit.wikimedia.org/r/353505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedf24e31c62152936c852389d1cdb4e1daac068f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: wmf/1.30.0-wmf.1
Gerrit-Owner: Gilles <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
