Skip to content

Commit e8ebe68

Browse files
committed
Merge branch 'release_3_3' into release_3_4
2 parents 336b46b + f6c569c commit e8ebe68

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

lizmap/modules/lizmap/classes/lizmapFtsSearch.listener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected function checkLizmapFts()
4242
try {
4343
// try to get the specific search profile to do not rebuild it
4444
$cnx = jDb::getConnection($profile);
45-
$cnx->query('SELECT * FROM lizmap_search LIMIT 0;');
45+
@$cnx->query('SELECT * FROM lizmap_search LIMIT 0;');
4646
$ok = true;
4747
} catch (Exception $e) {
4848
$ok = false;

lizmap/www/assets/js/attributeTable.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,13 @@ var lizAttributeTable = function() {
115115
}
116116

117117
config.layers[configLayerName]['crs'] = featureType.getElementsByTagName('SRS')[0].textContent;
118-
lizMap.loadProjDefinition( config.layers[configLayerName].crs, function() {
119-
new OpenLayers.Projection(config.layers[configLayerName].crs);
120-
});
118+
119+
if (config.layers[configLayerName]['crs'] !== ""){
120+
lizMap.loadProjDefinition(config.layers[configLayerName].crs, function (aProj) {
121+
new OpenLayers.Projection(config.layers[configLayerName].crs);
122+
});
123+
}
124+
121125
var bbox = featureType.getElementsByTagName('LatLongBoundingBox')[0];
122126
atConfig['bbox'] = [
123127
parseFloat(bbox.getAttribute('minx'))

0 commit comments

Comments
 (0)