From 6c0892bdaa447768ae0b5982889da8c7d0ad9e60 Mon Sep 17 00:00:00 2001
From: alvaro <alvaro@alia.(none)>
Date: Wed, 22 Feb 2012 14:00:20 -0800
Subject: [PATCH] Fixed problems with service module when serving no html
content
Fixed bug in googlemap filter
---
classes/modules/serviceModule.php | 2 +-
lib/Haanga/lib/Haanga/Extension/Filter/Googlemaps.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/classes/modules/serviceModule.php b/classes/modules/serviceModule.php
index 61a4a556..0e1a0200 100644
--- a/classes/modules/serviceModule.php
+++ b/classes/modules/serviceModule.php
@@ -27,9 +27,9 @@ class ServiceModule extends abstractModule{
}
return array($modelFile, $viewFile);
}elseif(file_exists($lodspk['model'].'queries')){
- if($extension != 'html'){$lodspk['resultRdf'] = true;}
$modelFile = $lodspk['model'].'queries';
if(!file_exists($lodspk['view'])){
+ $lodspk['resultRdf'] = true;
$viewFile = null;
}else{
$viewFile = $lodspk['view'];
diff --git a/lib/Haanga/lib/Haanga/Extension/Filter/Googlemaps.php b/lib/Haanga/lib/Haanga/Extension/Filter/Googlemaps.php
index 92e36635..36e7b6ea 100644
--- a/lib/Haanga/lib/Haanga/Extension/Filter/Googlemaps.php
+++ b/lib/Haanga/lib/Haanga/Extension/Filter/Googlemaps.php
@@ -50,7 +50,7 @@ class Haanga_Extension_Filter_Googlemaps{
$pre = "<div id='map_canvas_".$randId."' style='width: ".$w."px; height: ".$h."px'></div><script type='text/javascript'
src='http://maps.googleapis.com/maps/api/js?sensor=false'></script>
<script type='text/javascript'>
- <![CDATA[
+ //<![CDATA[
function initialize() {
var myOptions = {
zoom: 4,
@@ -89,7 +89,7 @@ class Haanga_Extension_Filter_Googlemaps{
}
google.maps.event.addDomListener(window, 'load', initialize);
- ]]>
+ //]]>
</script>";
return $pre;
}
--
GitLab