From 9b0b7d32a4d7ab6d1bbd0f8ca14be9fbf325f081 Mon Sep 17 00:00:00 2001
From: "GODZilla0480@gmail.com" <>
Date: Sun, 16 Oct 2011 17:25:14 +0000
Subject: Fixed Issue#365 introduced in r3030

---
 HISTORY                               |  1 +
 framework/Data/Common/TDbMetaData.php | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/HISTORY b/HISTORY
index 8a74a213..d0be41db 100644
--- a/HISTORY
+++ b/HISTORY
@@ -32,6 +32,7 @@ BUG: Issue #353 - Accordion control behaves oddly if clicked too fast (Gabor)
 ENH: Issue #356 - Added a new "Clickable" operating mode to TDatePicker (ctrlaltca)
 BUG: Issue #361 - TActiveListBox multiple selection bug (ctrlaltca)
 BUG: Issue #366 - Use divs instead of spans around tables in TActiveDataGrid (ctrlaltca)
+BUG: Issue #365 - [Runtime Notice] Declaration of T${DriverName}MetaData::quoteTableName() should be compatible with that of TDbMetaData::quoteTableName() (Yves)
 
 Version 3.1.10 Jul 17, 2011
 BUG: Added missing timeout on TCacheHttpSession (ctrlaltca)
diff --git a/framework/Data/Common/TDbMetaData.php b/framework/Data/Common/TDbMetaData.php
index bc29927f..b8872759 100644
--- a/framework/Data/Common/TDbMetaData.php
+++ b/framework/Data/Common/TDbMetaData.php
@@ -132,10 +132,14 @@ abstract class TDbMetaData extends TComponent
 	 * @param string $rgt right delimiter
 	 * @return string the properly quoted table name
 	 */
-	public function quoteTableName($name, $lft='', $rgt='')
+	public function quoteTableName($name)
 	{
 		$name = str_replace(self::$delimiterIdentifier, '', $name);
 
+		$args = func_get_args();
+		$rgt = $lft = isset($args[1]) ? $args[1] : '';
+		$rgt = isset($args[2]) ? $args[2] : $rgt;
+
 		if(strpos($name, '.')===false)
 			return $lft . $name . $rgt;
 		$names=explode('.', $name);
@@ -151,8 +155,12 @@ abstract class TDbMetaData extends TComponent
 	 * @param string $rgt right delimiter
 	 * @return string the properly quoted column name
 	 */
-	public function quoteColumnName($name, $lft='', $rgt='')
+	public function quoteColumnName($name)
 	{
+		$args = func_get_args();
+		$rgt = $lft = isset($args[1]) ? $args[1] : '';
+		$rgt = isset($args[2]) ? $args[2] : $rgt;
+
 		return $lft . str_replace(self::$delimiterIdentifier, '', $name) . $rgt;
 	}
 
@@ -163,8 +171,12 @@ abstract class TDbMetaData extends TComponent
 	 * @param string $rgt right delimiter
 	 * @return string the properly quoted column alias
 	 */
-	public function quoteColumnAlias($name, $lft='', $rgt='')
+	public function quoteColumnAlias($name)
 	{
+		$args = func_get_args();
+		$rgt = $lft = isset($args[1]) ? $args[1] : '';
+		$rgt = isset($args[2]) ? $args[2] : $rgt;
+
 		return $lft . str_replace(self::$delimiterIdentifier, '', $name) . $rgt;
 	}
 }
-- 
cgit v1.2.3