[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[wmf/1.28.0-wmf.22]: Repair text track attributes

2016-10-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Repair text track attributes
..


Repair text track attributes

This was broken in I4227b88ae94e3cfcfd62fb7fe221190d7fe33f71

Fixes regression in subtitles loading from Commons on the other sites.

Bug: T122737
Change-Id: I6498c32929892454700e852d412056a5acc2453a
(cherry picked from commit 3a4d3b54745a93def80a6b06b6d803f3663483f2)
---
M TimedMediaTransformOutput.php
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Dereckson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/TimedMediaTransformOutput.php b/TimedMediaTransformOutput.php
index b15ed68..215754d 100644
--- a/TimedMediaTransformOutput.php
+++ b/TimedMediaTransformOutput.php
@@ -334,11 +334,11 @@
foreach ( $mediaTracks as &$track ) {
foreach ( $track as $attr => $val ) {
if ( $attr === 'title' || $attr === 'provider' 
) {
-   $source[ 'data-mw' . $attr ] = $val;
-   unset( $source[ $attr ] );
+   $track[ 'data-mw' . $attr ] = $val;
+   unset( $track[ $attr ] );
} elseif ( $attr === 'dir' ) {
-   $source[ 'data-' . $attr ] = $val;
-   unset( $source[ $attr ] );
+   $track[ 'data-' . $attr ] = $val;
+   unset( $track[ $attr ] );
}
}
}

-- 
To view, visit https://gerrit.wikimedia.org/r/316069
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6498c32929892454700e852d412056a5acc2453a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: wmf/1.28.0-wmf.22
Gerrit-Owner: Brion VIBBER 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[wmf/1.28.0-wmf.22]: Repair text track attributes

2016-10-15 Thread Brion VIBBER (Code Review) 
Brion VIBBER has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/316069

Change subject: Repair text track attributes
..

Repair text track attributes

This was broken in I4227b88ae94e3cfcfd62fb7fe221190d7fe33f71

Fixes regression in subtitles loading from Commons on the other sites.

Bug: T122737
Change-Id: I6498c32929892454700e852d412056a5acc2453a
(cherry picked from commit 3a4d3b54745a93def80a6b06b6d803f3663483f2)
---
M TimedMediaTransformOutput.php
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler 
refs/changes/69/316069/1

diff --git a/TimedMediaTransformOutput.php b/TimedMediaTransformOutput.php
index b15ed68..215754d 100644
--- a/TimedMediaTransformOutput.php
+++ b/TimedMediaTransformOutput.php
@@ -334,11 +334,11 @@
foreach ( $mediaTracks as &$track ) {
foreach ( $track as $attr => $val ) {
if ( $attr === 'title' || $attr === 'provider' 
) {
-   $source[ 'data-mw' . $attr ] = $val;
-   unset( $source[ $attr ] );
+   $track[ 'data-mw' . $attr ] = $val;
+   unset( $track[ $attr ] );
} elseif ( $attr === 'dir' ) {
-   $source[ 'data-' . $attr ] = $val;
-   unset( $source[ $attr ] );
+   $track[ 'data-' . $attr ] = $val;
+   unset( $track[ $attr ] );
}
}
}

-- 
To view, visit https://gerrit.wikimedia.org/r/316069
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6498c32929892454700e852d412056a5acc2453a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: wmf/1.28.0-wmf.22
Gerrit-Owner: Brion VIBBER 
Gerrit-Reviewer: TheDJ 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits