Yaron Koren has submitted this change and it was merged.

Change subject: Include googlemaps input for latest Maps version
......................................................................


Include googlemaps input for latest Maps version

Change-Id: Id6a02ab3e19f3c41b9bce7a6f8b01d66f86a332b
---
M includes/PF_FormPrinter.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/includes/PF_FormPrinter.php b/includes/PF_FormPrinter.php
index 08a23bd..623ff79 100644
--- a/includes/PF_FormPrinter.php
+++ b/includes/PF_FormPrinter.php
@@ -55,9 +55,9 @@
                $this->registerInputType( 'PFTreeInput' );
                $this->registerInputType( 'PFTokensInput' );
                $this->registerInputType( 'PFRegExpInput' );
-               // Only add this if the Semantic Maps extension is not
-               // included.
-               if ( !defined( 'SM_VERSION' ) ) {
+               // Add this if the Semantic Maps extension is not
+               // included, or if it's SM (really Maps) v4.0 or higher.
+               if ( !defined( 'SM_VERSION' ) || version_compare( SM_VERSION, 
'4.0', '>=' ) ) {
                        $this->registerInputType( 'PFGoogleMapsInput' );
                }
                $this->registerInputType( 'PFOpenLayersInput' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id6a02ab3e19f3c41b9bce7a6f8b01d66f86a332b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <[email protected]>
Gerrit-Reviewer: Yaron Koren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to