[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiChat[master]: Newer smiley registration method

2016-12-30 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329687 )

Change subject: Newer smiley registration method
..


Newer smiley registration method

Bug:T46561
Change-Id: I842d649a3aea46f01a761091d0295c141b00bafb
---
M MediaWikiChatClass.php
M extension.json
2 files changed, 4 insertions(+), 9 deletions(-)

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



diff --git a/MediaWikiChatClass.php b/MediaWikiChatClass.php
index e1b3c1f..0a8ef65 100644
--- a/MediaWikiChatClass.php
+++ b/MediaWikiChatClass.php
@@ -185,20 +185,15 @@
 
if ( is_array( $smileyData ) ) {
$smileys = array();
-   $codes = array();
foreach ( $smileyData as $line ) {
$line = trim( $line );
$bits = explode( ' ', $line );
 
-   if ( count( $bits ) >= 1 ) { // any line with a 
code
-   $codes[] = $bits[0];
-   }
-   if ( count( $bits ) == 2 ) { // final line 
giving filename
-   $filename = $bits[1];
-   foreach ( $codes as $code) {
+   if ( count( $bits ) > 1 ) {
+   $filename = array_pop( $bits );
+   foreach ( $bits as $code) {
$smileys[$code] = $filename;
}
-   $codes = array();
}
}
}
diff --git a/extension.json b/extension.json
index e93ef0f..6a08f0d 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "MediaWikiChat",
-   "version": "2.19.2",
+   "version": "2.19.3",
"author": [
"Adam Carter/UltrasonicNXT"
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I842d649a3aea46f01a761091d0295c141b00bafb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT 
Gerrit-Reviewer: UltrasonicNXT 
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...MediaWikiChat[master]: Newer smiley registration method

2016-12-30 Thread UltrasonicNXT (Code Review) 
UltrasonicNXT has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329687 )

Change subject: Newer smiley registration method
..

Newer smiley registration method

Bug:T46561
Change-Id: I842d649a3aea46f01a761091d0295c141b00bafb
---
M MediaWikiChatClass.php
M extension.json
2 files changed, 4 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat 
refs/changes/87/329687/1

diff --git a/MediaWikiChatClass.php b/MediaWikiChatClass.php
index e1b3c1f..0a8ef65 100644
--- a/MediaWikiChatClass.php
+++ b/MediaWikiChatClass.php
@@ -185,20 +185,15 @@
 
if ( is_array( $smileyData ) ) {
$smileys = array();
-   $codes = array();
foreach ( $smileyData as $line ) {
$line = trim( $line );
$bits = explode( ' ', $line );
 
-   if ( count( $bits ) >= 1 ) { // any line with a 
code
-   $codes[] = $bits[0];
-   }
-   if ( count( $bits ) == 2 ) { // final line 
giving filename
-   $filename = $bits[1];
-   foreach ( $codes as $code) {
+   if ( count( $bits ) > 1 ) {
+   $filename = array_pop( $bits );
+   foreach ( $bits as $code) {
$smileys[$code] = $filename;
}
-   $codes = array();
}
}
}
diff --git a/extension.json b/extension.json
index e93ef0f..6a08f0d 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "MediaWikiChat",
-   "version": "2.19.2",
+   "version": "2.19.3",
"author": [
"Adam Carter/UltrasonicNXT"
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I842d649a3aea46f01a761091d0295c141b00bafb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT 

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