AntonLV 10 лет назад
Родитель
Сommit
7d5b2de8ad
2 измененных файлов с 4 добавлено и 3 удалено
  1. 1 1
      inc/classes/BxDolPrivacy.php
  2. 3 2
      modules/boonex/market/classes/BxMarketDb.php

+ 1 - 1
inc/classes/BxDolPrivacy.php

@@ -251,7 +251,7 @@ class BxDolPrivacy extends BxDol implements iBxDolFactoryObject
     function check($iObjectId, $iViewerId = 0)
     {
         if(empty($iViewerId))
-            $iViewerId = bx_get_logged_profile_id();
+            $iViewerId = (int)bx_get_logged_profile_id();
 
         $aObject = $this->_oDb->getObjectInfo($this->convertActionToField($this->_aObject['action']), $iObjectId);
         if(empty($aObject) || !is_array($aObject))

+ 3 - 2
modules/boonex/market/classes/BxMarketDb.php

@@ -123,7 +123,7 @@ class BxMarketDb extends BxBaseModTextDb
 				if(isset($aParams['paid']) && (int)$aParams['paid'] == 1)
 					$sWhereClause .= " AND `te`.`" . $CNF['FIELD_PRICE_SINGLE'] . "`<>'0' AND `te`.`" . $CNF['FIELD_PRICE_RECURRING'] . "`<>'0'";
 
-				$sOrderClause = "`te`.`added` " . (isset($aParams['order_way']) ? $aOrderWay[$aParams['order_way']] : "DESC");
+				$sOrderClause = "`te`.`" . (isset($aParams['order_by']) ? $aParams['order_by'] : "added") . "` " . (isset($aParams['order_way']) ? $aOrderWay[$aParams['order_way']] : "DESC");
 				break;
 
 			case 'keyword':
@@ -301,7 +301,7 @@ class BxMarketDb extends BxBaseModTextDb
                 );
 
                 $sSelectClause = "`tl`.`id`";
-                $sWhereClause = " `tl`.`profile_id`=:profile_id AND `tl`.`product_id`=:product_id";
+                $sWhereClause = " AND `tl`.`profile_id`=:profile_id AND `tl`.`product_id`=:product_id";
 
                 if(!empty($aParams['domain'])) {
                 	$aMethod['params'][1]['domain'] = $aParams['domain'];
@@ -431,6 +431,7 @@ class BxMarketDb extends BxBaseModTextDb
     		'type' => BX_MARKET_LICENSE_TYPE_RECURRING
     	);
 
+    	//--- Move to deleted licenses table with 'expire' as reason.  
 		$sQuery = "INSERT IGNORE INTO `" . $this->_oConfig->CNF['TABLE_LICENSES_DELETED'] . "` SELECT *, 'expire' AS `reason`, UNIX_TIMESTAMP() AS `deleted` FROM `" . $this->_oConfig->CNF['TABLE_LICENSES'] . "` WHERE " . $sWhereClause;
 		$this->query($sQuery);