Merge branch 'master' of https://github.com/unacms/una

modules/boonex/events/updates/14.0.8_15.0.0/install/installer.php

@@ -28,7 +28,7 @@ class BxEventsUpdater extends BxDolStudioUpdater
             if(!$this->oDb->isFieldExists('bx_events_prices', 'added'))
                 $this->oDb->query("ALTER TABLE `bx_events_prices` ADD `added` int(11) NOT NULL default '0' AFTER `price`");
             if(!$this->oDb->isFieldExists('bx_events_prices', 'default'))
-                $this->oDb->query("ALTER TABLE `bx_events_prices` ADD `default` tinyint(4) NOT NULL default '0' AFTER `votes`");
+                $this->oDb->query("ALTER TABLE `bx_events_prices` ADD `default` tinyint(4) NOT NULL default '0' AFTER `order`");
             if(!$this->oDb->isFieldExists('bx_events_prices', 'active'))
                 $this->oDb->query("ALTER TABLE `bx_events_prices` ADD `active` tinyint(4) NOT NULL default '1' AFTER `default`");
         }

upgrade/files/14.0.0-15.0.0.A1/files/inc/classes/BxDolSearch.php

@@ -577,6 +577,8 @@ class BxDolSearchResult implements iBxDolReplaceable
     {
         $sModule = 'system';
         $sUnitType = 'content';
+        $sHomeUrl = '';
+        
         if(!empty($this->oModule)) {
             $sModule = $this->oModule->getName();
 
@@ -584,6 +586,8 @@ class BxDolSearchResult implements iBxDolReplaceable
                  $sUnitType = 'profile';
             if(method_exists($this->oModule, 'serviceIsGroupProfile') && $this->oModule->serviceIsGroupProfile())
                  $sUnitType = 'context';
+            
+            $sHomeUrl = bx_api_get_relative_url(BxDolPermalinks::getInstance()->permalink($this->oModule->_oConfig->CNF['URL_HOME']));
         }
 
         $sUnit =  'list';
@@ -596,7 +600,12 @@ class BxDolSearchResult implements iBxDolReplaceable
             'per_page' => $this->aCurrent['paginate']['perPage'],
             'start' => $this->aCurrent['paginate']['start'],
             'type' => $this->_sMode,
+            'view' => $this->_aParams['unit_view']
         ];
+        
+        if ($sHomeUrl){
+            $aParams['home_url'] = $sHomeUrl;
+        }
 
         foreach(['author', 'category', 'context', 'joined_profile', 'followed_contexts', 'level'] as $sParamAdd)
             if(isset($this->_aParams[$sParamAdd]))

upgrade/files/14.0.0-15.0.0.A1/files/plugins/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'unaio/una',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '9de12135e0fc0b88aff7094e6cbf51573c7976b9',
+        'reference' => '297da0517184f74c2a37135bc2fc1c185b69a3e1',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -347,7 +347,7 @@
         'unaio/una' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '9de12135e0fc0b88aff7094e6cbf51573c7976b9',
+            'reference' => '297da0517184f74c2a37135bc2fc1c185b69a3e1',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),

upgrade/files/14.0.0-15.0.0.A1/files/plugins_public/highlight/highlight.min.js

@@ -1,5 +1,5 @@
 /*!
-  Highlight.js v11.11.1 (git: 9de12135e0)
+  Highlight.js v11.11.1 (git: 297da05171)
   (c) 2006-2025 Josh Goebel <hello@joshgoebel.com> and other contributors
   License: BSD-3-Clause
  */