summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-07-19 14:17:13 +0200
committerAndrey Andreev <narf@bofh.bg>2012-07-19 14:17:13 +0200
commit391dc6cdec77c4a71a7a6589652bd8d4a3623154 (patch)
treecc979f745da239cdc8aff74ea6bf43cbea860cf6 /system/libraries
parent2d486231c0fbc9a5c9ad5bf6897e7bb1aff275ba (diff)
parentfa4af2c268eb920e8eb772b793962000c10ac79c (diff)
Merge develop changes
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Migration.php2
-rw-r--r--system/libraries/Xmlrpcs.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php
index c786703ca..5d637d44a 100644
--- a/system/libraries/Migration.php
+++ b/system/libraries/Migration.php
@@ -285,7 +285,7 @@ class CI_Migration {
if ( ! $migrations = $this->find_migrations())
{
$this->_error_string = $this->lang->line('migration_none_found');
- return false;
+ return FALSE;
}
$last_migration = basename(end($migrations));
diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php
index e81f2ca9a..5d01d374d 100644
--- a/system/libraries/Xmlrpcs.php
+++ b/system/libraries/Xmlrpcs.php
@@ -230,7 +230,7 @@ class CI_Xmlrpcs extends CI_Xmlrpc
);
xml_set_object($parser, $parser_object);
- xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, true);
+ xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, TRUE);
xml_set_element_handler($parser, 'open_tag', 'closing_tag');
xml_set_character_data_handler($parser, 'character_data');
//xml_set_default_handler($parser, 'default_handler');