From 6228873cf9d6471463d2413e7dfd7447f759baf2 Mon Sep 17 00:00:00 2001
From: "christophe.boulain" <>
Date: Wed, 3 Dec 2008 14:22:03 +0000
Subject: Merge from trunk

---
 framework/Web/Services/TFeedService.php | 1 -
 framework/Web/Services/TJsonService.php | 2 +-
 framework/Web/Services/TSoapService.php | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'framework/Web/Services')

diff --git a/framework/Web/Services/TFeedService.php b/framework/Web/Services/TFeedService.php
index fea39290..7ecd10a7 100644
--- a/framework/Web/Services/TFeedService.php
+++ b/framework/Web/Services/TFeedService.php
@@ -143,4 +143,3 @@ interface IFeedContentProvider
 	public function getContentType();
 }
 
-?>
diff --git a/framework/Web/Services/TJsonService.php b/framework/Web/Services/TJsonService.php
index 93ad10d2..e3ed9a7f 100644
--- a/framework/Web/Services/TJsonService.php
+++ b/framework/Web/Services/TJsonService.php
@@ -92,7 +92,7 @@ class TJsonService extends TService
 				throw new TConfigurationException('jsonservice_class_required',$id);
 		}
 		else
-			throw new THttpException(404,'jsonservice_feed_unknown',$id);
+			throw new THttpException(404,'jsonservice_provider_unknown',$id);
 	}
 
 	/**
diff --git a/framework/Web/Services/TSoapService.php b/framework/Web/Services/TSoapService.php
index 259fa5f8..f5962647 100644
--- a/framework/Web/Services/TSoapService.php
+++ b/framework/Web/Services/TSoapService.php
@@ -612,4 +612,3 @@ class TSoapServer extends TApplicationComponent
 	}
 }
 
-?>
-- 
cgit v1.2.3