diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-06-06 14:51:04 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-06-06 14:51:04 -0700 |
| commit | b179b106c2b4d3971498f513ffc71eff1b6b1a5d (patch) | |
| tree | ccffecba610b9dfc72ba6f4057c54ca0c8ae9fb7 /system/libraries | |
| parent | bccaad92bb3b2ecc7c95e5eaf728b9be6e8a3b3a (diff) | |
Update Kohana to r4409
Diffstat (limited to 'system/libraries')
| -rw-r--r-- | system/libraries/Profiler.php | 4 | ||||
| -rw-r--r-- | system/libraries/Router.php | 18 | ||||
| -rw-r--r-- | system/libraries/drivers/Database/Mssql.php | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index 47d82ace..9da053fb 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -8,7 +8,7 @@ * POST Data - The name and values of any POST data submitted to the current page. * Cookie Data - All cookies sent for the current request. * - * $Id: Profiler.php 4090 2009-03-19 01:27:45Z bharat $ + * $Id: Profiler.php 4383 2009-06-03 00:17:24Z ixmatus $ * * @package Profiler * @author Kohana Team @@ -104,7 +104,7 @@ class Profiler_Core { $view = new View('kohana_profiler', $data); // Return rendered view if $return is TRUE - if ($return == TRUE) + if ($return === TRUE) return $view->render(); // Add profiler data to the output diff --git a/system/libraries/Router.php b/system/libraries/Router.php index 6dc9b10c..ef0e1e47 100644 --- a/system/libraries/Router.php +++ b/system/libraries/Router.php @@ -2,7 +2,7 @@ /** * Router * - * $Id: Router.php 4350 2009-05-14 18:58:18Z zombor $ + * $Id: Router.php 4391 2009-06-04 03:10:12Z zombor $ * * @package Core * @author Kohana Team @@ -213,17 +213,17 @@ class Router_Core { elseif (isset($_SERVER['PHP_SELF']) AND $_SERVER['PHP_SELF']) { Router::$current_uri = $_SERVER['PHP_SELF']; - - if (($strpos_fc = strpos(Router::$current_uri, KOHANA)) !== FALSE) - { - // Remove the front controller from the current uri - Router::$current_uri = substr(Router::$current_uri, $strpos_fc + strlen(KOHANA)); - } } - + + if (($strpos_fc = strpos(Router::$current_uri, KOHANA)) !== FALSE) + { + // Remove the front controller from the current uri + Router::$current_uri = (string) substr(Router::$current_uri, $strpos_fc + strlen(KOHANA)); + } + // Remove slashes from the start and end of the URI Router::$current_uri = trim(Router::$current_uri, '/'); - + if (Router::$current_uri !== '') { if ($suffix = Kohana::config('core.url_suffix') AND strpos(Router::$current_uri, $suffix) !== FALSE) diff --git a/system/libraries/drivers/Database/Mssql.php b/system/libraries/drivers/Database/Mssql.php index 6947679a..8b5ed50b 100644 --- a/system/libraries/drivers/Database/Mssql.php +++ b/system/libraries/drivers/Database/Mssql.php @@ -298,7 +298,7 @@ class Database_Mssql_Driver extends Database_Driver public function field_data($table) { - $query = $this->query('SHOW COLUMNS FROM '.$this->escape_table($table), $this->link); + $query = $this->query("SELECT COLUMN_NAME AS Field, DATA_TYPE as Type FROM INFORMATION_SCHEMA.Columns WHERE TABLE_NAME = '".$this->escape_table($table)."'", $this->link); return $query->result_array(TRUE); } |