Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173506
Change subject: Fix Undefined index: 0
......................................................................
Fix Undefined index: 0
Bug: 73113
Change-Id: Ie6291cb4c5a33dc3ce62bdacfa956442ecfc08d1
---
M includes/DiscussionParser.php
1 file changed, 7 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/06/173506/1
diff --git a/includes/DiscussionParser.php b/includes/DiscussionParser.php
index 99a610e..79a2926 100644
--- a/includes/DiscussionParser.php
+++ b/includes/DiscussionParser.php
@@ -861,16 +861,18 @@
// Step 2: Generalise it
// Trim off the timezone to replace at the end
- $output = $exemplarTimestamp;
+
$tzRegex = '/\s*\(\w+\)\s*$/';
- $tzMatches = array();
- preg_match( $tzRegex, $output, $tzMatches );
- $output = preg_replace( $tzRegex, '', $output );
+
+ $output = preg_replace( $tzRegex, '', $exemplarTimestamp );
$output = preg_quote( $output, '/' );
$output = preg_replace( '/[^\d\W]+/u', '[^\d\W]+', $output );
$output = preg_replace( '/\d+/u', '\d+', $output );
- $output .= preg_quote( $tzMatches[0] );
+ $tzMatches = array();
+ if ( preg_match( $tzRegex, $exemplarTimestamp, $tzMatches ) ) {
+ $output .= preg_quote( $tzMatches[0] );
+ }
if ( !preg_match( "/$output/u", $exemplarTimestamp ) ) {
throw new MWException( "Timestamp regex does not match
exemplar" );
--
To view, visit https://gerrit.wikimedia.org/r/173506
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6291cb4c5a33dc3ce62bdacfa956442ecfc08d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
