Merge branch 'master' of https://github.com/opencart/opencart

opencart · Aug 26, 2015 · eaeba89 · eaeba89
2 parents e06b222 + f64120d
commit eaeba89
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/upload/admin/model/customer/customer.php b/upload/admin/model/customer/customer.php
@@ -506,9 +506,15 @@ public function getTotalCustomerRewardsByOrderId($order_id) {
 		return $query->row['total'];
 	}
 
-	public function getIps($customer_id) {
-		$query = $this->db->query("SELECT * FROM " . DB_PREFIX . "customer_ip WHERE customer_id = '" . (int)$customer_id . "'");
+	public function getIps($customer_id, $start = 0, $limit = 10) {
+		if ($start < 0) {
+			$start = 0;
+		}
+		if ($limit < 1) {
+			$limit = 10;
+		}
 
+		$query = $this->db->query("SELECT * FROM " . DB_PREFIX . "customer_ip WHERE customer_id = '" . (int)$customer_id . "' ORDER BY date_added DESC LIMIT " . (int)$start . "," . (int)$limit);
 		return $query->rows;
 	}
 

diff --git a/upload/catalog/controller/information/contact.php b/upload/catalog/controller/information/contact.php
@@ -76,7 +76,7 @@ public function index() {
 
 		$data['button_submit'] = $this->language->get('button_submit');
 
-		$data['action'] = $this->url->link('information/contact');
+		$data['action'] = $this->url->link('information/contact', '', 'SSL');
 
 		$this->load->model('tool/image');