Katie Horn has submitted this change and it was merged.

Change subject: Allow submitting / downloading messages with '.'
......................................................................


Allow submitting / downloading messages with '.'

Finishes the fix from the previous commit.  That let you view a
message with a period in the id, this lets you do something with it.

Change-Id: I5c924cee46474bdf9131fd3cb8307554d9174bdf
---
M sites/all/modules/wmf_common/wmf_common.module
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Katie Horn: Looks good to me, approved



diff --git a/sites/all/modules/wmf_common/wmf_common.module 
b/sites/all/modules/wmf_common/wmf_common.module
index d9ee473..086968e 100644
--- a/sites/all/modules/wmf_common/wmf_common.module
+++ b/sites/all/modules/wmf_common/wmf_common.module
@@ -226,7 +226,7 @@
 
 function wmf_common_queue_item_submit( $form, &$form_state ) {
   $queue = preg_replace( '/[^-_a-z]|-damaged$/', '', 
$form_state['build_info']['args'][0] );
-  $correlationId = preg_replace( '/[^-a-zA-Z0-9:]/', '', 
$form_state['build_info']['args'][1] );
+  $correlationId = preg_replace( '/[^-a-zA-Z0-9\.:]/', '', 
$form_state['build_info']['args'][1] );
 
   $headers = array(
     'correlation-id' => $correlationId,
@@ -264,7 +264,7 @@
 
 function wmf_common_queue_item_download( $queue, $correlationId ) {
   $queue = preg_replace( '/[^-_a-z]/', '', $queue );
-  $correlationId = preg_replace( '/[^-a-zA-Z0-9:]/', '', $correlationId );
+  $correlationId = preg_replace( '/[^-a-zA-Z0-9\.:]/', '', $correlationId );
 
   $q = queue2civicrm_stomp();
   $msg = $q->getByAnyId( $queue, $correlationId );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5c924cee46474bdf9131fd3cb8307554d9174bdf
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Katie Horn <kh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to