Merging in default branch
diff --git a/system/core/Config.php b/system/core/Config.php
index 4493ff2..1096a9e 100644
--- a/system/core/Config.php
+++ b/system/core/Config.php
@@ -144,6 +144,7 @@
$loaded = TRUE;
log_message('debug', 'Config file loaded: '.$file_path);
+ break;
}
if ($loaded === FALSE)
@@ -326,4 +327,4 @@
// 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 51a9c6c..16eb4b2 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -898,7 +898,7 @@
function validation_errors($prefix = '', $suffix = '')
{
if (FALSE === ($OBJ =& _get_validation_object()))
- {
+ {var_dump(_get_validation_object()); exit;
return '';
}
@@ -1035,7 +1035,7 @@
// 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 1113f86..cc62e66 100644
--- a/system/libraries/Pagination.php
+++ b/system/libraries/Pagination.php
@@ -30,7 +30,7 @@
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
diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html
index e86ec13..3c366a6 100644
--- a/user_guide/libraries/pagination.html
+++ b/user_guide/libraries/pagination.html
@@ -71,8 +71,8 @@
<code>
$this->load->library('pagination');<br /><br />
$config['base_url'] = 'http://example.com/index.php/test/page/';<br />
-$config['total_rows'] = '200';<br />
-$config['per_page'] = '20';
+$config['total_rows'] = 200;<br />
+$config['per_page'] = 20;
<br /><br />
$this->pagination->initialize($config);