From c8861d5cfc5779d2c7edd450a66d60b590364fc5 Mon Sep 17 00:00:00 2001
From: "Christophe.Boulain" <>
Date: Thu, 29 Jan 2009 07:43:23 +0000
Subject: Fixed Issue#107

---
 HISTORY                          | 1 +
 framework/Data/TDbConnection.php | 2 +-
 framework/PradoBase.php          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/HISTORY b/HISTORY
index 96951cfb..1ac2e726 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,7 @@
 Version 3.1.5 (to be released)
 ==============================
 BUG: URL wildcard patterns didn't work with subfolders
+BUG: Issue~107 - typo in TDbConnection::getCharset() (Christophe)
 
 Version 3.1.4 January 11, 2009
 ==============================
diff --git a/framework/Data/TDbConnection.php b/framework/Data/TDbConnection.php
index 259ca7b7..26d61883 100644
--- a/framework/Data/TDbConnection.php
+++ b/framework/Data/TDbConnection.php
@@ -267,7 +267,7 @@ class TDbConnection extends TComponent
 	 */
 	public function getCharset ()
 	{
-		return $this>_charset;
+		return $this->_charset;
 	}
 	
 	/**
diff --git a/framework/PradoBase.php b/framework/PradoBase.php
index ea6b9737..c2d73b16 100644
--- a/framework/PradoBase.php
+++ b/framework/PradoBase.php
@@ -66,7 +66,7 @@ class PradoBase
 	 */
 	public static function getVersion()
 	{
-		return '3.1.4';
+		return '3.1.5a';
 	}
 
 	/**
-- 
cgit v1.2.3