Created
March 5, 2013 16:29
-
-
Save mdouchin/5091581 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/lizmap/modules/lizmap/controllers/annotation.classic.php b/lizmap/modules/lizmap/controllers/annotation.classic.php | |
index bf7b50a..6293b42 100644 | |
--- a/lizmap/modules/lizmap/controllers/annotation.classic.php | |
+++ b/lizmap/modules/lizmap/controllers/annotation.classic.php | |
@@ -164,7 +164,10 @@ class annotationCtrl extends jController { | |
// Get datasource information from QGIS | |
$datasourceMatch = preg_match( | |
- "#dbname='([^ ]+)' (?:host=([^ ]+) )?(?:port=([0-9]+) )?(?:user='([^ ]+)' )?(?:password='([^ ]+)' )?(?:sslmode=([^ ]+) )?(?:key='([^ ]+)' | |
+# "#dbname='([^ ]+)' (?:host=([^ ]+) )?(?:port=([0-9]+) )?(?:user='([^ ]+)' )?(?:password='([^ ]+)' )?(?:sslmode=([^ ]+) )?(?:key='([^ ]+)' | |
+ | |
+ "#dbname='([^ ]+)' (?:host=([^ ]+) )?(?:port=([0-9]+) )?(?:user='([^ ]+)' )?(?:password='([^ ]+)' )?(?:sslmode=([^ ]+) )?(?:key='([^ ]+)' | |
+ | |
$datasource, | |
$dt | |
); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment