[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Fix for HTML-encoded strings when delimiter is ;

2017-11-10 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390407 )

Change subject: Fix for HTML-encoded strings when delimiter is ;
..


Fix for HTML-encoded strings when delimiter is ;

Change-Id: Id56cb5411137fed6fea73bd3273acca4adc290ce
---
M includes/CargoQueryDisplayer.php
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/includes/CargoQueryDisplayer.php b/includes/CargoQueryDisplayer.php
index f37bc7c..9b2dc04 100644
--- a/includes/CargoQueryDisplayer.php
+++ b/includes/CargoQueryDisplayer.php
@@ -105,6 +105,8 @@
// There's probably an easier way to do
// this, using array_map().
$delimiter = 
$fieldDescription->getDelimiter();
+   // We need to decode it in case the 
delimiter is ;
+   $value = html_entity_decode( $value );
$fieldValues = explode( $delimiter, 
$value );
foreach ( $fieldValues as $i => 
$fieldValue ) {
if ( trim( $fieldValue ) == '' 
) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id56cb5411137fed6fea73bd3273acca4adc290ce
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
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...Cargo[master]: Fix for HTML-encoded strings when delimiter is ;

2017-11-10 Thread Yaron Koren (Code Review) 
Yaron Koren has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390407 )

Change subject: Fix for HTML-encoded strings when delimiter is ;
..

Fix for HTML-encoded strings when delimiter is ;

Change-Id: Id56cb5411137fed6fea73bd3273acca4adc290ce
---
M includes/CargoQueryDisplayer.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/07/390407/2

diff --git a/includes/CargoQueryDisplayer.php b/includes/CargoQueryDisplayer.php
index f37bc7c..9b2dc04 100644
--- a/includes/CargoQueryDisplayer.php
+++ b/includes/CargoQueryDisplayer.php
@@ -105,6 +105,8 @@
// There's probably an easier way to do
// this, using array_map().
$delimiter = 
$fieldDescription->getDelimiter();
+   // We need to decode it in case the 
delimiter is ;
+   $value = html_entity_decode( $value );
$fieldValues = explode( $delimiter, 
$value );
foreach ( $fieldValues as $i => 
$fieldValue ) {
if ( trim( $fieldValue ) == '' 
) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id56cb5411137fed6fea73bd3273acca4adc290ce
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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