Umherirrender has submitted this change and it was merged.
Change subject: ID3: Protect against playtime_seconds and bitrate being
undefined
......................................................................
ID3: Protect against playtime_seconds and bitrate being undefined
Change-Id: Iaf9abf18da599758334ca06e020d16b220280f42
---
M handlers/ID3Handler/ID3Handler.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Umherirrender: Verified; Looks good to me, approved
diff --git a/handlers/ID3Handler/ID3Handler.php
b/handlers/ID3Handler/ID3Handler.php
index 6ebcda3..1e3ae4f 100644
--- a/handlers/ID3Handler/ID3Handler.php
+++ b/handlers/ID3Handler/ID3Handler.php
@@ -67,7 +67,7 @@
*/
function getBitrate( $file ){
$metadata = $this->unpackMetadata( $file->getMetadata() );
- if ( !$metadata || isset( $metadata['error'] ) ) {
+ if ( !$metadata || isset( $metadata['error'] ) || !isset(
$metadata['bitrate'] ) ) {
return 0;
} else {
return $metadata['bitrate'];
@@ -80,7 +80,7 @@
*/
function getLength( $file ) {
$metadata = $this->unpackMetadata( $file->getMetadata() );
- if ( !$metadata || isset( $metadata['error'] ) ) {
+ if ( !$metadata || isset( $metadata['error'] ) || !isset(
$metadata['playtime_seconds'] ) ) {
return 0;
} else {
return $metadata['playtime_seconds'];
--
To view, visit https://gerrit.wikimedia.org/r/190248
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf9abf18da599758334ca06e020d16b220280f42
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
