[MediaWiki-commits] [Gerrit] Fix color extraction - change (mediawiki...Kartographer)

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review.

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

Change subject: Fix color extraction
......................................................................

Fix color extraction

Bug: T136890
Change-Id: I5c3530f62c6a19b8685edb57ca154cc8197c70f0
---
M includes/Tag/MapLink.php
M tests/parserTests.txt
2 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer 
refs/changes/99/292499/1

diff --git a/includes/Tag/MapLink.php b/includes/Tag/MapLink.php
index 2e778ac..841dc3f 100644
--- a/includes/Tag/MapLink.php
+++ b/includes/Tag/MapLink.php
@@ -61,7 +61,7 @@
                        // if the color is invalid
                        preg_match( '/^#?(([0-9a-fA-F]{3}){1,2})$/', 
$this->markerProperties->{'marker-color'}, $m );
                        if ( $m && $m[2] ) {
-                               return "background: #{$m[2]};";
+                               return "background: #{$m[1]};";
                        }
                }
 
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 039e4df..57d2732 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -182,7 +182,7 @@
        },
        "properties": {
                "marker-symbol": "-letter",
-               "marker-color": "#abc"
+               "marker-color": "#abcdef"
        }
 },
 {
@@ -207,12 +207,12 @@
        },
        "properties": {
                "marker-symbol": "-number",
-               "marker-color": "fff"
+               "marker-color": "FFF"
        }
 }
 </maplink>
 !! result
-<p><a class="mw-kartographer mw-kartographer-link mw-kartographer-autostyled" 
mw-data="interface" style="background: #abc;" data-style="osm-intl" 
data-zoom="13" data-lat="10" data-lon="20" 
data-overlays="[&quot;_19a72be79a2653cf0eeccdba3776a568873e8865&quot;]">A</a>
-</p><p><a class="mw-kartographer mw-kartographer-link 
mw-kartographer-autostyled" mw-data="interface" style="background: #fff; 
border: yellow;" data-style="osm-intl" data-zoom="13" data-lat="10" 
data-lon="20" 
data-overlays="[&quot;_348b58ab5ba1db004b387561db7d945cdf90cea0&quot;]">2</a>
+<p><a class="mw-kartographer mw-kartographer-link mw-kartographer-autostyled" 
mw-data="interface" style="background: #abcdef;" data-style="osm-intl" 
data-zoom="13" data-lat="10" data-lon="20" 
data-overlays="[&quot;_0d28e3b8954f29b4a6af62bd43a9cacc70ce0261&quot;]">A</a>
+</p><p><a class="mw-kartographer mw-kartographer-link 
mw-kartographer-autostyled" mw-data="interface" style="background: #FFF; 
border: yellow;" data-style="osm-intl" data-zoom="13" data-lat="10" 
data-lon="20" 
data-overlays="[&quot;_665bb76cf5c33a0a86108f17819b1c68d26a7ba7&quot;]">2</a>
 </p>
 !! end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c3530f62c6a19b8685edb57ca154cc8197c70f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: MaxSem <maxsem.w...@gmail.com>

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