Merge remote-tracking branch 'origin/1.2.5' into 1.2.5

abantecart · Oct 28, 2015 · d8aba3e · d8aba3e
2 parents 0d32db5 + ab36128
commit d8aba3e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/public_html/admin/controller/api/customer/orders.php b/public_html/admin/controller/api/customer/orders.php
@@ -43,7 +43,16 @@ public function get() {
 			'sort'  => 'o.date_added',
 			'order' => 'DESC',
 			'start' => 0,
+			'limit' => 20
 		);		
+
+		if($request['start']) {
+			$filter['start'] = (int)$request['start'];
+		}
+		if($request['limit']) {
+			$filter['limit'] = (int)$request['limit'];
+		}
+
 		$orders =  $this->model_sale_order->getOrders($filter);
 		if (!count($orders)) {
 			$this->rest->setResponseData( array('Message' => 'No order records found for the customer') );

diff --git a/public_html/admin/view/default/template/pages/extension/extensions_store.tpl b/public_html/admin/view/default/template/pages/extension/extensions_store.tpl
@@ -39,11 +39,13 @@
 		<?php 
 		if($content){
 		    $current_categ = $text_all_categories;
-		    foreach ($content['categories']['subcategories'] as $category) {
-		    	if ($category['active']) {
-		    		$current_categ = $category['name'];
-		    	}
-		}
+		    if(is_array($content['categories']['subcategories'])) {
+			    foreach ($content['categories']['subcategories'] as $category) {
+			    	if ($category['active']) {
+			    		$current_categ = $category['name'];
+			    	}
+				}
+		    }
 		?>
 		<div class="btn-group">
 		  <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">

diff --git a/public_html/core/engine/language.php b/public_html/core/engine/language.php
@@ -277,6 +277,7 @@ public function getClientBrowserLanguage() {
 			if($browser_languages){
 				foreach ($browser_languages as $browser_language){
 					$browser_language = trim($browser_language);
+					//validate and ignore browser data if causing warnings
 					if (!$browser_language || @preg_match("/".$browser_language."/i", '') === false){
 						continue;
 					}
@@ -285,7 +286,9 @@ public function getClientBrowserLanguage() {
 						if (!$locale){
 							continue;
 						}
+						//match browser language code with AbanteCart language locales
 						if (preg_grep("/".$browser_language."/i", $locale)){
+							//matching language was found
 							return $value['code'];
 						}
 					}

diff --git a/public_html/core/lib/session.php b/public_html/core/lib/session.php
@@ -59,7 +59,7 @@ public function __construct( $ses_name = '' ) {
 	public function init( $session_name ) {
 		$session_mode = '';
 
-		if(IS_API) {
+		if(IS_API===true) {
 			//set up session specific for API based on the token or create new 
 			$token = '';
 			if($_GET['token']) {

diff --git a/public_html/static_pages/index.php b/public_html/static_pages/index.php
@@ -49,7 +49,7 @@
 	unset($_SESSION['exception_msg']);
 }
 
-$subject = rawurlencode("AbanteCart Error Report " . UNIQUE_ID);
+$subject = rawurlencode("AbanteCart Crash Report " . UNIQUE_ID);
 $pos = -2;
 $t ='';
 $count = 0;