- Timestamp:
- 2013/01/18 17:04:44 (11 years ago)
- Location:
- branches/version-2_12-multilang
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_12-multilang
- Property svn:mergeinfo changed
/branches/version-2_12-dev merged: 22145-22146,22158,22164-22165,22167-22169,22187-22196,22199-22204,22231,22241 /branches/version-2_12_3 (added) merged: 22219,22229,22259-22261
- Property svn:mergeinfo changed
-
branches/version-2_12-multilang/tests
- Property svn:ignore
-
old new 1 1 phpunit.xml 2 2 require.php 3 tmp 3 4
-
- Property svn:ignore
-
branches/version-2_12-multilang/tests/class/test/util/User_Utils.php
r22144 r22278 29 29 return; 30 30 } 31 if ($customer == null) { 32 $customer = self::getDefaultCustomer(); 33 } 31 $customer = array_merge(self::getDefaultCustomer(), $customer); 34 32 $_SESSION['customer']['customer_id'] = $customer['customer_id']; 35 33 $_SESSION['customer']['email'] = $customer['email']; 34 $objQuery->delete('dtb_customer', 'customer_id = ?', array($customer['customer_id'])); 36 35 $objQuery->insert('dtb_customer', $customer); 37 36 }
Note: See TracChangeset
for help on using the changeset viewer.