summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe.Boulain <>2009-11-04 16:38:15 +0000
committerChristophe.Boulain <>2009-11-04 16:38:15 +0000
commit879cced5e01d43378065c938483b55a35ff10834 (patch)
treef4c756e7fdb3a6b0b359dbbe5814da0361996bb2
parentd69704df59e343a9e25e779548ae851b668e3e7f (diff)
Minor corrections to avoid runtime notice with php 5.3, and function rename in TDbConnection
-rw-r--r--framework/Base/TModel.php2
-rwxr-xr-xframework/Testing/Data/TDbConnection.php16
-rw-r--r--requirements/index.php2
3 files changed, 17 insertions, 3 deletions
diff --git a/framework/Base/TModel.php b/framework/Base/TModel.php
index 492bcbd9..14368b33 100644
--- a/framework/Base/TModel.php
+++ b/framework/Base/TModel.php
@@ -33,7 +33,7 @@ abstract class TModel extends TComponent implements IteratorAggregate, ArrayAcce
* @param string EventName
* @param TEvent Event
*/
- public function raiseEvent($name, $event)
+ public function raiseEvent($name, $event, $param=null)
{
parent::raiseEvent($name, $event, new TEventParameter());
}
diff --git a/framework/Testing/Data/TDbConnection.php b/framework/Testing/Data/TDbConnection.php
index 92708907..b1dd739a 100755
--- a/framework/Testing/Data/TDbConnection.php
+++ b/framework/Testing/Data/TDbConnection.php
@@ -425,7 +425,7 @@ class TDbConnection extends TComponent
* @return string the properly quoted string
* @see http://www.php.net/manual/en/function.PDO-quote.php
*/
- public function quoteString($str)
+ public function quoteValue($str)
{
if($this->getActive())
return $this->_pdo->quote($str);
@@ -434,6 +434,20 @@ class TDbConnection extends TComponent
}
/**
+ *
+ * Prado 3.1 compatibility method.
+ *
+ * @see {@link quoteValue}
+ *
+ * @param string $str
+ * @return string
+ */
+ public function quoteString($str)
+ {
+ return $this->quoteValue($str);
+ }
+
+ /**
* Quotes a table name for use in a query.
* @param string table name
* @return string the properly quoted table name
diff --git a/requirements/index.php b/requirements/index.php
index 44879240..252f7a45 100644
--- a/requirements/index.php
+++ b/requirements/index.php
@@ -222,7 +222,7 @@ function getUserLanguages()
$languages=array();
foreach(explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
{
- $array=split(';q=',trim($language));
+ $array=explode(';q=',trim($language));
$languages[trim($array[0])]=isset($array[1])?(float)$array[1]:1.0;
}
arsort($languages);