summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorGreg Aker <greg.aker@ellislab.com>2011-05-06 18:38:04 +0200
committerGreg Aker <greg.aker@ellislab.com>2011-05-06 18:38:04 +0200
commitbd4c87543818bd4573308743d44e12b78349ecd0 (patch)
tree8afedb90cf13a1a65f89de70dbb4f0c26d4ccf05 /system
parent02958b5b78835a484c1038d77f4bcfc5ae273a2d (diff)
parent827f3de2733e85ede6311feb2e4bf73ecf209eb3 (diff)
merging in changes
Diffstat (limited to 'system')
-rw-r--r--system/core/Config.php2
-rw-r--r--system/database/DB_active_rec.php1
-rw-r--r--system/helpers/date_helper.php9
3 files changed, 7 insertions, 5 deletions
diff --git a/system/core/Config.php b/system/core/Config.php
index fa71f4d3d..55c623b3c 100644
--- a/system/core/Config.php
+++ b/system/core/Config.php
@@ -55,7 +55,7 @@ class CI_Config {
{
$base_url = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off' ? 'https' : 'http';
$base_url .= '://'. $_SERVER['HTTP_HOST'];
- $base_url .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);
+ $base_url .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']).'/';
}
else
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index 508f6bedf..83d481699 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -204,6 +204,7 @@ class CI_DB_active_record extends CI_DB_driver {
$sql = $type.'('.$this->_protect_identifiers(trim($select)).') AS '.$alias;
$this->ar_select[] = $sql;
+ $this->ar_no_escape[] = NULL;
if ($this->ar_caching === TRUE)
{
diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php
index f3f01f751..951181b8c 100644
--- a/system/helpers/date_helper.php
+++ b/system/helpers/date_helper.php
@@ -112,15 +112,16 @@ if ( ! function_exists('standard_date'))
function standard_date($fmt = 'DATE_RFC822', $time = '')
{
$formats = array(
- 'DATE_ATOM' => '%Y-%m-%dT%H:%i:%s%Q',
+ 'DATE_ATOM' => '%Y-%m-%dT%H:%i:%s%O',
'DATE_COOKIE' => '%l, %d-%M-%y %H:%i:%s UTC',
- 'DATE_ISO8601' => '%Y-%m-%dT%H:%i:%s%Q',
+ 'DATE_ISO8601' => '%Y-%m-%dT%H:%i:%s%O',
'DATE_RFC822' => '%D, %d %M %y %H:%i:%s %O',
- 'DATE_RFC850' => '%l, %d-%M-%y %H:%m:%i UTC',
+ 'DATE_RFC850' => '%l, %d-%M-%y %H:%i:%s UTC',
'DATE_RFC1036' => '%D, %d %M %y %H:%i:%s %O',
'DATE_RFC1123' => '%D, %d %M %Y %H:%i:%s %O',
+ 'DATE_RFC2822' => '%D, %d %M %Y %H:%i:%s %O',
'DATE_RSS' => '%D, %d %M %Y %H:%i:%s %O',
- 'DATE_W3C' => '%Y-%m-%dT%H:%i:%s%Q'
+ 'DATE_W3C' => '%Y-%m-%dT%H:%i:%s%O'
);
if ( ! isset($formats[$fmt]))