UNA.IO related changes.

modules/base/groups/classes/BxBaseModGroupsUploaderCoverCrop.php

@@ -13,7 +13,7 @@ class BxBaseModGroupsUploaderCoverCrop extends BxBaseModProfileUploaderCoverCrop
 {
     public function __construct ($aObject, $sStorageObject, $sUniqId, $oTemplate)
     {
-        parent::__construct($aObject, $sStorageObject, $sUniqId, $oTemplate ? $oTemplate : $this->_oModule->_oTemplate);
+        parent::__construct($aObject, $sStorageObject, $sUniqId, $oTemplate);
     }
 
     protected function isAdmin ($iContentId = 0)

modules/base/profile/classes/BxBaseModProfileUploaderCoverCrop.php

@@ -11,11 +11,16 @@
 
 class BxBaseModProfileUploaderCoverCrop extends BxTemplUploaderHTML5
 {
+    protected $_sModule;
     protected $_oModule;
 
     public function __construct ($aObject, $sStorageObject, $sUniqId, $oTemplate)
     {
+        if(!empty($this->_sModule) && empty($this->_oModule))
+            $this->_oModule = BxDolModule::getInstance($this->_sModule);
+
         parent::__construct($aObject, $sStorageObject, $sUniqId, $oTemplate ? $oTemplate : $this->_oModule->_oTemplate);
+
         $this->_sUploaderFormTemplate = 'uploader_form_crop_cover.html';
     }
 

modules/base/profile/classes/BxBaseModProfileUploaderPictureCrop.php

@@ -11,10 +11,14 @@
 
 class BxBaseModProfileUploaderPictureCrop extends BxTemplUploaderCrop
 {
+    protected $_sModule;
     protected $_oModule;
 
     public function __construct ($aObject, $sStorageObject, $sUniqId, $oTemplate)
     {
+        if(!empty($this->_sModule))
+            $this->_oModule = BxDolModule::getInstance($this->_sModule);
+
         parent::__construct($aObject, $sStorageObject, $sUniqId, $oTemplate);
         
     }

modules/boonex/market/classes/BxMarketDb.php

@@ -69,6 +69,10 @@ class BxMarketDb extends BxBaseModTextDb
     		$sFieldsClause .= " ((" . $sLicDir . ") OR (" . $sLicPack . ")) AS `purchased_on`, ";
     	}
 
+        //--- Include content by ids or names
+        if(!empty($aParams['include_by']) && in_array($aParams['include_by'], array('id', 'name')) && !empty($aParams['include_values']))
+            $sWhereClause .= " AND `te`.`" . $aParams['include_by'] . "` IN (" . $this->implode_escape($aParams['include_values']) . ") ";
+
     	//--- Exclude content by ids or names
         if(!empty($aParams['exclude_by']) && in_array($aParams['exclude_by'], array('id', 'name')) && !empty($aParams['exclude_values']))
             $sWhereClause .= " AND `te`.`" . $aParams['exclude_by'] . "` NOT IN (" . $this->implode_escape($aParams['exclude_values']) . ") ";