Upgrade script from 13.0.0-RC3 to 13.0.0-RC4

unacms · Apr 3, 2023 · 30bb593 · 30bb593
1 parent d61b587
commit 30bb593
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/upgrade/files/13.0.0.RC3-13.0.0.RC4/files/inc/classes/BxDolDb.php b/upgrade/files/13.0.0.RC3-13.0.0.RC4/files/inc/classes/BxDolDb.php
@@ -689,7 +689,7 @@ public function error($aError)
         bx_log('sys_db', "$sErrorType\n" . 
             (empty($aError['message']) ? '' : "  Error: {$aError['message']}\n") . 
             (empty($aError['query']) ? '' : "  Query: {$aError['query']}\n") . 
-            (getLoggedId() ? '' : "  Account ID: " . getLoggedId() . "\n")
+            (!function_exists('getLoggedId') || !getLoggedId() ? '' : "  Account ID: " . getLoggedId() . "\n")
         );
 
         bx_show_service_unavailable_error_and_exit($sOutput);

diff --git a/upgrade/files/13.0.0.RC3-13.0.0.RC4/files/plugins/autoload.php b/upgrade/files/13.0.0.RC3-13.0.0.RC4/files/plugins/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInite03c73eae6753f705f91534183874c56::getLoader();
+return ComposerAutoloaderInitddef6a94b127e79526354a3d2201274f::getLoader();
diff --git a/upgrade/files/13.0.0.RC3-13.0.0.RC4/files/plugins/composer/autoload_real.php b/upgrade/files/13.0.0.RC3-13.0.0.RC4/files/plugins/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInite03c73eae6753f705f91534183874c56
+class ComposerAutoloaderInitddef6a94b127e79526354a3d2201274f
 {
     private static $loader;
 
@@ -24,15 +24,15 @@ public static function getLoader()
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInite03c73eae6753f705f91534183874c56', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitddef6a94b127e79526354a3d2201274f', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInite03c73eae6753f705f91534183874c56', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitddef6a94b127e79526354a3d2201274f', '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\ComposerStaticInite03c73eae6753f705f91534183874c56::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInitddef6a94b127e79526354a3d2201274f::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -53,19 +53,19 @@ public static function getLoader()
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInite03c73eae6753f705f91534183874c56::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInitddef6a94b127e79526354a3d2201274f::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequiree03c73eae6753f705f91534183874c56($fileIdentifier, $file);
+            composerRequireddef6a94b127e79526354a3d2201274f($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequiree03c73eae6753f705f91534183874c56($fileIdentifier, $file)
+function composerRequireddef6a94b127e79526354a3d2201274f($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

diff --git a/upgrade/files/13.0.0.RC3-13.0.0.RC4/files/plugins/composer/autoload_static.php b/upgrade/files/13.0.0.RC3-13.0.0.RC4/files/plugins/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInite03c73eae6753f705f91534183874c56
+class ComposerStaticInitddef6a94b127e79526354a3d2201274f
 {
     public static $files = array (
         '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php',
@@ -214,10 +214,10 @@ class ComposerStaticInite03c73eae6753f705f91534183874c56
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInite03c73eae6753f705f91534183874c56::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInite03c73eae6753f705f91534183874c56::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInite03c73eae6753f705f91534183874c56::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInite03c73eae6753f705f91534183874c56::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitddef6a94b127e79526354a3d2201274f::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitddef6a94b127e79526354a3d2201274f::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInitddef6a94b127e79526354a3d2201274f::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInitddef6a94b127e79526354a3d2201274f::$classMap;
 
         }, null, ClassLoader::class);
     }

diff --git a/upgrade/files/13.0.0.RC3-13.0.0.RC4/files/plugins/composer/installed.php b/upgrade/files/13.0.0.RC3-13.0.0.RC4/files/plugins/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => 'f364c53f0aa8307a9b42274acb327d210ee0b09a',
+        'reference' => 'd61b587727b37716bee10b5a5cb8af48cceb8865',
         'name' => 'unaio/una',
         'dev' => true,
     ),
@@ -332,7 +332,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => 'f364c53f0aa8307a9b42274acb327d210ee0b09a',
+            'reference' => 'd61b587727b37716bee10b5a5cb8af48cceb8865',
             'dev_requirement' => false,
         ),
         'wikimedia/less.php' => array(
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@

		require_once __DIR__ . '/composer/autoload_real.php';

		return ComposerAutoloaderInite03c73eae6753f705f91534183874c56::getLoader();
		return ComposerAutoloaderInitddef6a94b127e79526354a3d2201274f::getLoader();