summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-05-23 19:42:15 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-05-23 19:42:15 +0200
commit13a9bf472f548463682d4d3fafce146b9a9ced3c (patch)
tree6587038defc1f9d6c8a032fdc25b9b4fb5787626 /system/libraries
parent55a6ddb0c7bab1149bb1ddfa3a1aff46612c91d4 (diff)
parent7d3399ead6857d5b2c7dd60165b85108e159ed7b (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Cart.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Cart.php b/system/libraries/Cart.php
index b73ed5128..827050310 100644
--- a/system/libraries/Cart.php
+++ b/system/libraries/Cart.php
@@ -245,7 +245,7 @@ class CI_Cart {
// This becomes the unique "row ID"
if (isset($items['options']) && count($items['options']) > 0)
{
- $rowid = md5($items['id'].implode('', $items['options']));
+ $rowid = md5($items['id'].serialize($items['options']));
}
else
{