diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/codeigniter/CodeIgniter.php | 5 | ||||
| -rw-r--r-- | system/drivers/DB_postgre.php | 7 | ||||
| -rw-r--r-- | system/helpers/date_helper.php | 2 | ||||
| -rw-r--r-- | system/libraries/Validation.php | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 872f4c049..1f7850ecf 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -188,6 +188,11 @@ if ($RTR->scaffolding_request === TRUE) } else { + if ($method == $class) + { + $method = 'index'; + } + if ( ! method_exists($CI, $method)) { show_404(); diff --git a/system/drivers/DB_postgre.php b/system/drivers/DB_postgre.php index cf59f0fdc..fd98ec78b 100644 --- a/system/drivers/DB_postgre.php +++ b/system/drivers/DB_postgre.php @@ -211,7 +211,8 @@ class CI_DB_postgre extends CI_DB { * Escape Table Name * * This function adds backticks if the table name has a period - * in it. Some DBs will get cranky unless periods are escaped + * in it. Some DBs will get cranky unless periods are escaped. + * NOT NEEDED FOR POSTGRE * * @access public * @param string the table name @@ -219,10 +220,12 @@ class CI_DB_postgre extends CI_DB { */ function escape_table($table) { + /* if (stristr($table, '.')) { - $table = preg_replace("/\./", ".", $table); + $table = preg_replace("/\./", "`.`", $table); } + */ return $table; } diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php index 2a3d50859..c8205bb7d 100644 --- a/system/helpers/date_helper.php +++ b/system/helpers/date_helper.php @@ -189,7 +189,7 @@ function timespan($seconds = 1, $time = '') { if ($minutes > 0) { - $str .= $minutes.' '.$obj->lang->line((($minutes > 1) ? 'date_minutes' : 'date_minutes')).', '; + $str .= $minutes.' '.$obj->lang->line((($minutes > 1) ? 'date_minutes' : 'date_minute')).', '; } $seconds -= $minutes * 60; diff --git a/system/libraries/Validation.php b/system/libraries/Validation.php index e037e69c5..30faa85ed 100644 --- a/system/libraries/Validation.php +++ b/system/libraries/Validation.php @@ -208,7 +208,7 @@ class CI_Validation { { if (in_array('isset', $ex) OR in_array('required', $ex)) { - if ( ! isset($this->messages['isset'])) + if ( ! isset($this->_error_messages['isset'])) { if (FALSE === ($line = $this->obj->lang->line('isset'))) { |