diff options
| -rw-r--r-- | framework/Base/TModel.php | 2 | ||||
| -rwxr-xr-x | framework/Testing/Data/TDbConnection.php | 16 | ||||
| -rw-r--r-- | requirements/index.php | 2 |
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);
|