summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/core/Config.php3
-rw-r--r--system/helpers/form_helper.php4
-rw-r--r--system/libraries/Pagination.php2
3 files changed, 5 insertions, 4 deletions
diff --git a/system/core/Config.php b/system/core/Config.php
index 4493ff266..1096a9ea6 100644
--- a/system/core/Config.php
+++ b/system/core/Config.php
@@ -144,6 +144,7 @@ class CI_Config {
$loaded = TRUE;
log_message('debug', 'Config file loaded: '.$file_path);
+ break;
}
if ($loaded === FALSE)
@@ -326,4 +327,4 @@ class CI_Config {
// END CI_Config class
/* End of file Config.php */
-/* Location: ./system/core/Config.php */ \ No newline at end of file
+/* Location: ./system/core/Config.php */
diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index 51a9c6ca3..16eb4b2c9 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -898,7 +898,7 @@ if ( ! function_exists('validation_errors'))
function validation_errors($prefix = '', $suffix = '')
{
if (FALSE === ($OBJ =& _get_validation_object()))
- {
+ {var_dump(_get_validation_object()); exit;
return '';
}
@@ -1035,7 +1035,7 @@ if ( ! function_exists('_get_validation_object'))
// We set this as a variable since we're returning by reference.
$return = FALSE;
- if ( ! ($object = $CI->load->is_loaded('form_validation')))
+ if (FALSE !== ($object = $CI->load->is_loaded('form_validation')))
{
if ( ! isset($CI->$object) OR ! is_object($CI->$object))
{
diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
index 1113f862f..cc62e660b 100644
--- a/system/libraries/Pagination.php
+++ b/system/libraries/Pagination.php
@@ -30,7 +30,7 @@ class CI_Pagination {
var $prefix = ''; // A custom prefix added to the path.
var $suffix = ''; // A custom suffix added to the path.
- var $total_rows = ''; // Total number of items (database results)
+ var $total_rows = 0; // Total number of items (database results)
var $per_page = 10; // Max number of items you want shown per page
var $num_links = 2; // Number of "digit" links to show before/after the currently viewed page
var $cur_page = 0; // The current page being viewed