[MediaWiki-commits] [Gerrit] Correct path to fileicon-ogg.png for MW 1.24 - change (mediawiki...TimedMediaHandler)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: Correct path to fileicon-ogg.png for MW 1.24
......................................................................

Correct path to fileicon-ogg.png for MW 1.24

Bug: 70615
Change-Id: I0a1f26a9d9171d51d3da43f4be9cc52760a68fe2
---
M TimedMediaTransformOutput.php
1 file changed, 7 insertions(+), 2 deletions(-)


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

diff --git a/TimedMediaTransformOutput.php b/TimedMediaTransformOutput.php
index 5a08bf2..0af6135 100644
--- a/TimedMediaTransformOutput.php
+++ b/TimedMediaTransformOutput.php
@@ -44,8 +44,13 @@
         * @return string
         */
        function getUrl( $sizeOverride = false ){
-               global $wgStylePath;
-               $url = "$wgStylePath/common/images/icons/fileicon-ogg.png";
+               global $wgVersion, $wgScriptPath, $wgStylePath;
+               // Needs to be 1.24c because version_compare() works in 
confusing ways
+               if ( version_compare( $wgVersion, '1.24c', '>=' ) ) {
+                       $url = 
"$wgScriptPath/assets/file-type-icons/fileicon-ogg.png";
+               } else {
+                       $url = 
"$wgStylePath/common/images/icons/fileicon-ogg.png";
+               }
 
                if ( $this->isVideo ) {
                        if ( $this->thumbUrl ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a1f26a9d9171d51d3da43f4be9cc52760a68fe2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>

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