jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/381939 )
Change subject: Make CxserverWebService forward compatible
......................................................................
Make CxserverWebService forward compatible
It looks like cxserver is changing APIs without doing v2, so
copy some code from I3e8130df2e that has not gone live yet
because of another issue that prevents the restbase endpoint
from working.
Change-Id: Ia40f6af351d3aea519908d0f013386c62fcde6e5
---
M webservices/CxserverWebService.php
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
KartikMistry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/webservices/CxserverWebService.php
b/webservices/CxserverWebService.php
index 2c696e7..c001d36 100644
--- a/webservices/CxserverWebService.php
+++ b/webservices/CxserverWebService.php
@@ -71,7 +71,10 @@
throw new TranslationWebServiceException( 'Invalid
json: ' . serialize( $body ) );
}
- $text = preg_replace( '~^<div>(.*)</div>$~', '\1',
$response->contents );
+ $text = $response->contents;
+ if ( preg_match( '~^<div>(.*)</div>$~', $text ) ) {
+ $text = preg_replace( '~^<div>(.*)</div>$~', '\1',
$text );
+ }
$text = $this->unwrapUntranslatable( $text );
return trim( $text );
--
To view, visit https://gerrit.wikimedia.org/r/381939
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia40f6af351d3aea519908d0f013386c62fcde6e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: KartikMistry <kartik.mis...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
