Sfoglia il codice sorgente

Upgrade script from 14.0.0-RC1 to 14.0.0-RC2

Alex Trofimov 2 anni fa
parent
commit
a0c849b73a

+ 1 - 1
upgrade/files/14.0.0.RC1-14.0.0.RC2/files/inc/utils.inc.php

@@ -236,7 +236,7 @@ function bx_process_output ($mixedData, $iDataType = BX_DATA_TEXT, $mixedParams
         $s = bx_linkify_html($mixedData, 'class="' . BX_DOL_LINK_CLASS . '"');
 
         // remove empty tags from html content: #4203, #4486, #4827
-        $s = preg_replace("/<([a-z]+)(?:\s[^>]*)?>\s*(?:<br\s*\/?>\s*)*\s*<\/\1>/i", '', $s);
+        $s = preg_replace('/<([a-z]+)(?:\s[^>]*)?>((?:\s|<br\s*\/?>)*)<\/\1>/i', '', $s);
         $s = preg_replace('/(<br\s*\/?>\s*){2,}/i', '<br>', $s);
         return $mixedParams && is_array($mixedParams) && in_array('no_process_macro', $mixedParams) ? $s : bx_process_macros($s);
     case BX_DATA_TEXT_MULTILINE:

+ 1 - 1
upgrade/files/14.0.0.RC1-14.0.0.RC2/files/modules/base/text/template/entry-text.html

@@ -16,7 +16,7 @@
         <bx_if:show_entry_abstract>
             <div class="bx-base-text-abstract mb-3 md:mb-4 lg:mb-6 text-gray-600 dark:text-gray-400 text-xl font-medium">__entry_abstract__</div>
         </bx_if:show_entry_abstract>
-        <div class="bx-base-text-text">__entry_text__</div>
+        <div class="bx-base-text-text text-ellipsis overflow-hidden">__entry_text__</div>
     </div>
     <bx_if:show_links>
         <div class="__style_prefix__-item-links">

+ 1 - 1
upgrade/files/14.0.0.RC1-14.0.0.RC2/files/plugins/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit8ef46b8d3ba12847b0deee7a060ae731::getLoader();
+return ComposerAutoloaderInit4ec646b61823daa0b08c554cc68400b9::getLoader();

+ 7 - 7
upgrade/files/14.0.0.RC1-14.0.0.RC2/files/plugins/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit8ef46b8d3ba12847b0deee7a060ae731
+class ComposerAutoloaderInit4ec646b61823daa0b08c554cc68400b9
 {
     private static $loader;
 
@@ -24,15 +24,15 @@ class ComposerAutoloaderInit8ef46b8d3ba12847b0deee7a060ae731
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit8ef46b8d3ba12847b0deee7a060ae731', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit4ec646b61823daa0b08c554cc68400b9', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit8ef46b8d3ba12847b0deee7a060ae731', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit4ec646b61823daa0b08c554cc68400b9', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit8ef46b8d3ba12847b0deee7a060ae731::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit4ec646b61823daa0b08c554cc68400b9::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -53,19 +53,19 @@ class ComposerAutoloaderInit8ef46b8d3ba12847b0deee7a060ae731
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit8ef46b8d3ba12847b0deee7a060ae731::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit4ec646b61823daa0b08c554cc68400b9::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire8ef46b8d3ba12847b0deee7a060ae731($fileIdentifier, $file);
+            composerRequire4ec646b61823daa0b08c554cc68400b9($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire8ef46b8d3ba12847b0deee7a060ae731($fileIdentifier, $file)
+function composerRequire4ec646b61823daa0b08c554cc68400b9($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

+ 5 - 5
upgrade/files/14.0.0.RC1-14.0.0.RC2/files/plugins/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit8ef46b8d3ba12847b0deee7a060ae731
+class ComposerStaticInit4ec646b61823daa0b08c554cc68400b9
 {
     public static $files = array (
         '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php',
@@ -216,10 +216,10 @@ class ComposerStaticInit8ef46b8d3ba12847b0deee7a060ae731
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit8ef46b8d3ba12847b0deee7a060ae731::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit8ef46b8d3ba12847b0deee7a060ae731::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit8ef46b8d3ba12847b0deee7a060ae731::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInit8ef46b8d3ba12847b0deee7a060ae731::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit4ec646b61823daa0b08c554cc68400b9::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit4ec646b61823daa0b08c554cc68400b9::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit4ec646b61823daa0b08c554cc68400b9::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInit4ec646b61823daa0b08c554cc68400b9::$classMap;
 
         }, null, ClassLoader::class);
     }

+ 2 - 2
upgrade/files/14.0.0.RC1-14.0.0.RC2/files/plugins/composer/installed.php

@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '31bfda70010dab85c69130c1825bbba3b3918816',
+        'reference' => '0fab88f611d307a91b37f412efea18913f4f40c0',
         'name' => 'unaio/una',
         'dev' => true,
     ),
@@ -359,7 +359,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '31bfda70010dab85c69130c1825bbba3b3918816',
+            'reference' => '0fab88f611d307a91b37f412efea18913f4f40c0',
             'dev_requirement' => false,
         ),
         'wikimedia/less.php' => array(