New build

Automattic · Jan 12, 2021 · 6cf92be · 6cf92be
1 parent 1cd0dca
commit 6cf92be
Show file tree

Hide file tree

Showing 35 changed files with 112 additions and 72 deletions.
diff --git a/_inc/blocks/editor-beta.asset.php b/_inc/blocks/editor-beta.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'moment', 'react', 'wp-a11y', 'wp-annotations', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-token-list', 'wp-url', 'wp-viewport'), 'version' => 'a97cdd306aa0bb3f917fe47c793da401');
+<?php return array('dependencies' => array('lodash', 'moment', 'react', 'wp-a11y', 'wp-annotations', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-token-list', 'wp-url', 'wp-viewport'), 'version' => '4f1f4b10b726f9a9950eb4c23782cc64');
diff --git a/_inc/blocks/editor-beta.css b/_inc/blocks/editor-beta.css
diff --git a/_inc/blocks/editor-beta.rtl.css b/_inc/blocks/editor-beta.rtl.css
diff --git a/_inc/blocks/editor-experimental.asset.php b/_inc/blocks/editor-experimental.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'moment', 'react', 'wp-a11y', 'wp-annotations', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-token-list', 'wp-url', 'wp-viewport'), 'version' => 'a13f07f584e5299408d20c4806ea670c');
+<?php return array('dependencies' => array('lodash', 'moment', 'react', 'wp-a11y', 'wp-annotations', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-token-list', 'wp-url', 'wp-viewport'), 'version' => '16276972d33d75ef4ba617576c7abbba');
diff --git a/_inc/blocks/editor-experimental.css b/_inc/blocks/editor-experimental.css
diff --git a/_inc/blocks/editor-experimental.rtl.css b/_inc/blocks/editor-experimental.rtl.css
diff --git a/_inc/blocks/editor.asset.php b/_inc/blocks/editor.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'moment', 'react', 'wp-a11y', 'wp-annotations', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-token-list', 'wp-url', 'wp-viewport'), 'version' => '3cefc2cd48fc8b4839479403339664d9');
+<?php return array('dependencies' => array('lodash', 'moment', 'react', 'wp-a11y', 'wp-annotations', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-token-list', 'wp-url', 'wp-viewport'), 'version' => '4a62bd5a58c949e4d7fb0432d11f5db7');
diff --git a/_inc/blocks/editor.css b/_inc/blocks/editor.css
diff --git a/_inc/blocks/editor.rtl.css b/_inc/blocks/editor.rtl.css
diff --git a/_inc/blocks/story/view.asset.php b/_inc/blocks/story/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'wp-blob', 'wp-components', 'wp-compose', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '98172991a97e3c2c63426ae2b8bcaa81');
+<?php return array('dependencies' => array('lodash', 'react', 'wp-blob', 'wp-components', 'wp-compose', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '96ee5e5f017b196e457a4fa8b0ae67d8');
diff --git a/_inc/blocks/story/view.css b/_inc/blocks/story/view.css
diff --git a/_inc/blocks/story/view.rtl.css b/_inc/blocks/story/view.rtl.css
diff --git a/extensions/blocks/story/player/style.scss b/extensions/blocks/story/player/style.scss
@@ -480,6 +480,11 @@
 			.wp-story-title {
 				font-size: 14px;
 				font-weight: 600;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-line-clamp: 2;
+				-webkit-box-orient: vertical;
 
 				@media ( max-width: $break-medium ) {
 					font-size: 12px;
@@ -489,6 +494,8 @@
 			.wp-story-exit-fullscreen {
 				margin-left: auto;
 				order: 3;
+				min-width: 24px;
+				min-height: 24px;
 			}
 		}
 

diff --git a/jetpack.php b/jetpack.php
@@ -4,7 +4,7 @@
  * Plugin URI: https://jetpack.com
  * Description: Bring the power of the WordPress.com cloud to your self-hosted WordPress. Jetpack enables you to connect your blog to a WordPress.com account to use the powerful features normally only available to WordPress.com users.
  * Author: Automattic
- * Version: 9.3-beta
+ * Version: 9.3
  * Author URI: https://jetpack.com
  * License: GPL2+
  * Text Domain: jetpack
@@ -16,7 +16,7 @@
 
 define( 'JETPACK__MINIMUM_WP_VERSION', '5.5' );
 define( 'JETPACK__MINIMUM_PHP_VERSION', '5.6' );
-define( 'JETPACK__VERSION', '9.3-beta' );
+define( 'JETPACK__VERSION', '9.3' );
 
 /**
  * Constant used to fetch the connection owner token

diff --git a/modules/masterbar/admin-menu/class-admin-menu.php b/modules/masterbar/admin-menu/class-admin-menu.php
@@ -106,7 +106,7 @@ public function reregister_menu_items() {
 		$this->add_plugins_menu();
 		$this->add_users_menu( $calypso );
 		$this->add_tools_menu( $calypso );
-		$this->add_options_menu();
+		$this->add_options_menu( $calypso );
 
 		ksort( $GLOBALS['menu'] );
 	}
@@ -255,52 +255,78 @@ public function add_comments_menu( $calypso = true ) {
 	 */
 	public function add_appearance_menu( $calypso = true ) {
 		$user_can_customize = current_user_can( 'customize' );
-		$appearance_cap     = $user_can_customize ? 'customize' : 'edit_theme_options';
+		$appearance_cap     = current_user_can( 'switch_themes' ) ? 'switch_themes' : 'edit_theme_options';
 		$customize_slug     = $calypso ? 'https://wordpress.com/customize/' . $this->domain : 'customize.php';
 		$themes_slug        = $calypso ? 'https://wordpress.com/themes/' . $this->domain : 'themes.php';
-		$appearance_slug    = $user_can_customize ? $customize_slug : $themes_slug;
 		$customize_url      = add_query_arg( 'return', urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ), 'customize.php' ); // phpcs:ignore
-
 		remove_menu_page( 'themes.php' );
 		remove_submenu_page( 'themes.php', 'themes.php' );
 		remove_submenu_page( 'themes.php', 'theme-editor.php' );
 		remove_submenu_page( 'themes.php', $customize_url );
+		remove_submenu_page( 'themes.php', 'custom-header' );
+		remove_submenu_page( 'themes.php', 'custom-background' );
+
+		add_menu_page( esc_attr__( 'Appearance', 'jetpack' ), __( 'Appearance', 'jetpack' ), $appearance_cap, $themes_slug, null, 'dashicons-admin-appearance', 60 );
+		add_submenu_page( $themes_slug, esc_attr__( 'Themes', 'jetpack' ), __( 'Themes', 'jetpack' ), 'switch_themes', $themes_slug, null, 5 );
+		add_submenu_page( $themes_slug, esc_attr__( 'Customize', 'jetpack' ), __( 'Customize', 'jetpack' ), 'customize', $customize_slug, null, 10 );
 
-		add_menu_page( esc_attr__( 'Appearance', 'jetpack' ), __( 'Appearance', 'jetpack' ), $appearance_cap, $appearance_slug, null, 'dashicons-admin-appearance', 60 );
-		add_submenu_page( $appearance_slug, esc_attr__( 'Customize', 'jetpack' ), __( 'Customize', 'jetpack' ), 'customize', $customize_slug, null, 5 );
-		add_submenu_page( $appearance_slug, esc_attr__( 'Themes', 'jetpack' ), __( 'Themes', 'jetpack' ), 'switch_themes', $themes_slug, null, 10 );
+		// Maintain id as JS selector.
+		$GLOBALS['menu'][60][5] = 'menu-appearance'; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
 
 		if ( current_theme_supports( 'custom-header' ) && $user_can_customize ) {
 			$customize_header_url = add_query_arg( array( 'autofocus' => array( 'control' => 'header_image' ) ), $customize_url );
-			remove_submenu_page( 'themes.php', $customize_header_url );
+			remove_submenu_page( 'themes.php', esc_url( $customize_header_url ) );
+
+			// TODO: Remove WPCom_Theme_Customizer::modify_header_menu_links() and WPcom_Custom_Header::modify_admin_menu_links().
+			$customize_header_url = admin_url( 'themes.php?page=custom-header' );
+			remove_submenu_page( 'themes.php', esc_url( $customize_header_url ) );
 
-			$customize_header_url = add_query_arg( array( 'autofocus' => array( 'control' => 'header_image' ) ), $appearance_slug );
-			add_submenu_page( $appearance_slug, __( 'Header', 'jetpack' ), __( 'Header', 'jetpack' ), $appearance_cap, esc_url( $customize_header_url ), null, 15 );
+			$customize_header_url = add_query_arg( array( 'autofocus' => array( 'control' => 'header_image' ) ), $customize_slug );
+			add_submenu_page( $themes_slug, __( 'Header', 'jetpack' ), __( 'Header', 'jetpack' ), 'customize', esc_url( $customize_header_url ), null, 15 );
 		}
 
 		if ( current_theme_supports( 'custom-background' ) && $user_can_customize ) {
 			$customize_background_url = add_query_arg( array( 'autofocus' => array( 'control' => 'background_image' ) ), $customize_url );
-			remove_submenu_page( 'themes.php', $customize_background_url );
+			remove_submenu_page( 'themes.php', esc_url( $customize_background_url ) );
 
-			$customize_background_url = add_query_arg( array( 'autofocus' => array( 'control' => 'background_image' ) ), $appearance_slug );
-			add_submenu_page( $appearance_slug, esc_attr__( 'Background', 'jetpack' ), __( 'Background', 'jetpack' ), $appearance_cap, esc_url( $customize_background_url ), null, 20 );
+			// TODO: Remove Colors_Manager::modify_header_menu_links() and Colors_Manager_Common::modify_header_menu_links().
+			$customize_background_url = add_query_arg( array( 'autofocus' => array( 'section' => 'colors_manager_tool' ) ), admin_url( 'customize.php' ) );
+			remove_submenu_page( 'themes.php', esc_url( $customize_background_url ) );
+
+			$customize_background_url = add_query_arg( array( 'autofocus' => array( 'section' => 'colors_manager_tool' ) ), $customize_slug );
+			add_submenu_page( $themes_slug, esc_attr__( 'Background', 'jetpack' ), __( 'Background', 'jetpack' ), 'customize', esc_url( $customize_background_url ), null, 20 );
 		}
 
 		if ( current_theme_supports( 'widgets' ) ) {
 			remove_submenu_page( 'themes.php', 'widgets.php' );
 
-			$customize_menu_url = add_query_arg( array( 'autofocus' => array( 'panel' => 'widgets' ) ), $appearance_slug );
-			add_submenu_page( $appearance_slug, esc_attr__( 'Widgets', 'jetpack' ), __( 'Widgets', 'jetpack' ), $appearance_cap, esc_url( $customize_menu_url ), null, 20 );
+			$customize_menu_url = add_query_arg( array( 'autofocus' => array( 'panel' => 'widgets' ) ), $customize_slug );
+			add_submenu_page( $themes_slug, esc_attr__( 'Widgets', 'jetpack' ), __( 'Widgets', 'jetpack' ), 'customize', esc_url( $customize_menu_url ), null, 20 );
 		}
 
 		if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) ) {
 			remove_submenu_page( 'themes.php', 'nav-menus.php' );
 
-			$customize_menu_url = add_query_arg( array( 'autofocus' => array( 'panel' => 'nav_menus' ) ), $appearance_slug );
-			add_submenu_page( $appearance_slug, esc_attr__( 'Menus', 'jetpack' ), __( 'Menus', 'jetpack' ), $appearance_cap, esc_url( $customize_menu_url ), null, 20 );
+			$customize_menu_url = add_query_arg( array( 'autofocus' => array( 'panel' => 'nav_menus' ) ), $customize_slug );
+			add_submenu_page( $themes_slug, esc_attr__( 'Menus', 'jetpack' ), __( 'Menus', 'jetpack' ), 'customize', esc_url( $customize_menu_url ), null, 20 );
+		}
+
+		$this->migrate_submenus( 'themes.php', $themes_slug );
+		add_filter( 'parent_file', array( $this, 'appearance_parent_file' ) );
+	}
+
+	/**
+	 * Filters the parent file of an admin menu sub-menu item.
+	 *
+	 * @param string $parent_file The parent file.
+	 * @return string Updated parent file.
+	 */
+	public function appearance_parent_file( $parent_file ) {
+		if ( 'themes.php' === $parent_file ) {
+			$parent_file = 'https://wordpress.com/themes/' . $this->domain;
 		}
 
-		$this->migrate_submenus( 'themes.php', $appearance_slug );
+		return $parent_file;
 	}
 
 	/**
@@ -370,10 +396,21 @@ public function add_tools_menu( $calypso = true ) {
 	 * @param bool $calypso Optional. Whether links should point to Calypso or wp-admin. Default true (Calypso).
 	 */
 	public function add_options_menu( $calypso = true ) {
-		if ( $calypso ) {
-			remove_submenu_page( 'options-general.php', 'options-discussion.php' );
-			remove_submenu_page( 'options-general.php', 'options-writing.php' );
+		if ( ! $calypso ) {
+			return;
 		}
+
+		$options_slug = 'https://wordpress.com/settings/general/' . $this->domain;
+
+		remove_menu_page( 'options-general.php' );
+		remove_submenu_page( 'options-general.php', 'options-general.php' );
+		remove_submenu_page( 'options-general.php', 'options-discussion.php' );
+		remove_submenu_page( 'options-general.php', 'options-writing.php' );
+
+		add_menu_page( esc_attr__( 'Settings', 'jetpack' ), __( 'Settings', 'jetpack' ), 'manage_options', $options_slug, null, 'dashicons-admin-settings', 80 );
+		add_submenu_page( $options_slug, esc_attr__( 'General', 'jetpack' ), __( 'General', 'jetpack' ), 'manage_options', $options_slug, null, 10 );
+
+		$this->migrate_submenus( 'options-general.php', $options_slug );
 	}
 
 	/**

diff --git a/modules/masterbar/admin-menu/class-wpcom-admin-menu.php b/modules/masterbar/admin-menu/class-wpcom-admin-menu.php
@@ -173,7 +173,7 @@ public function add_stats_menu() {
 		if ( ! $this->is_api_request ) {
 			$menu_title .= sprintf(
 				'<img class="sidebar-unified__sparkline" width="80" height="20" src="%1$s" alt="%2$s">',
-				esc_url( home_url( 'wp-includes/charts/admin-bar-hours-scale-2x.php?masterbar=1&s=' . get_current_blog_id() ) ),
+				esc_url( site_url( 'wp-includes/charts/admin-bar-hours-scale-2x.php?masterbar=1&s=' . get_current_blog_id() ) ),
 				esc_attr__( 'Hourly views', 'jetpack' )
 			);
 		}

diff --git a/readme.txt b/readme.txt
@@ -1,7 +1,7 @@
 === Jetpack - WP Security, Backup, Speed, & Growth ===
 Contributors: automattic, adamkheckler, aduth, akirk, allendav, alternatekev, andy, annezazu, apeatling, azaozz, batmoo, barry, beaulebens, biskobe, blobaugh, brbrr, cainm, cena, cfinke, chaselivingston, chellycat, clickysteve, csonnek, danielbachhuber, davoraltman, daniloercoli, delawski, designsimply, dllh, drawmyface, dsmart, dzver, ebinnion, egregor, eliorivero, enej, eoigal, erania-pinnera, ethitter, fgiannar, gcorne, georgestephanis, gibrown, goldsounds, hew, hugobaeta, hypertextranch, iammattthomas, iandunn, jblz, jasmussen, jeffgolenski, jeherve, jenhooks, jenia, jessefriedman, jgs, jkudish, jmdodd, joanrho, johnjamesjacoby, jshreve, kbrownkd, keoshi, koke, kraftbj, lancewillett, leogermani, lschuyler, macmanx, martinremy, matt, matveb, mattwiebe, maverick3x6, mcsf, mdawaffe, mdbitz, MichaelArestad, migueluy, mikeyarce, mkaz, nancythanki, nickmomrik, obenland, oskosk, pento, professor44, rachelsquirrel, rdcoll, ryancowles, richardmuscat, richardmtl, robertbpugh, roccotripaldi, samhotchkiss, scarstocea, scottsweb, sdquirk, sermitr, simison, stephdau, tmoorewp, tyxla, Viper007Bond, westi, yoavf, zinigor
 Tags: WP, backup, social, AMP, WooCommerce, malware, scan, spam, CDN, social
-Stable tag: 9.2
+Stable tag: 9.3
 Requires at least: 5.5
 Requires PHP: 5.6
 Tested up to: 5.6
@@ -47,7 +47,7 @@ Create and customize your WordPress site, optimize it for visitors and revenue,
 * Grow traffic with SEO tools for Google, Bing, Twitter, Facebook, and WordPress.com. XML sitemap created automatically.
 * Advertise on your site to generate revenue. The Jetpack ad network automatically does the work for you to find high-quality ads that are placed on your site.
 * Manage Jetpack features from anywhere with the official WordPress mobile app, available for Apple iOS (iPhone or iPad) and Google Android.
-* Looking for a CRM? Check out the Jetpack CRM plugin which works alongside Jetpack to give you a simple and practical way to build relationships with your customers and leads.
+* Looking for Customer Relationship Management? Check out the [Jetpack CRM plugin](https://jetpackcrm.com) which works alongside Jetpack to give you a simple and practical way to build relationships with your customers and leads.
 
 = EASY DESIGN TOOLS =
 Quickly customize your site to make it stand out — no coding needed.
@@ -119,10 +119,6 @@ Once you’ve installed Jetpack, your stats will be available on your Jetpack da
 
 There are opportunities for developers at all levels to contribute. [Learn more about contributing to Jetpack](https://jetpack.com/contribute) or consider [joining our beta program](https://jetpack.com/beta).
 
-= Is Jetpack CRM included in the Jetpack plugin? =
-
-No, please download the separate Jetpack CRM plugin to use Jetpack CRM.
-
 = What else does Jetpack include? =
 
 Jetpack is the ultimate toolkit for WP for both the classic editor and the block editor, giving you everything you need for a professional site. It includes the following features:

diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit177d36bca4c3386e5ed78deb0ab1700e::getLoader();
+return ComposerAutoloaderInita35837708a7acdd1ffb0e38ef898764f::getLoader();
diff --git a/vendor/autoload_packages.php b/vendor/autoload_packages.php
@@ -5,7 +5,7 @@
  * @package automattic/jetpack-autoloader
  */
 
-namespace Automattic\Jetpack\Autoloader\jp177d36bca4c3386e5ed78deb0ab1700e;
+namespace Automattic\Jetpack\Autoloader\jpa35837708a7acdd1ffb0e38ef898764f;
 
  // phpcs:ignore
 

diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
@@ -29,7 +29,7 @@ class InstalledVersions
     'aliases' => 
     array (
     ),
-    'reference' => 'c7ae731fceeb8e0c8cc5baa3da824e2e367e28a4',
+    'reference' => '6428a5a1a6218e890fb6c06b05bd26ee547368e7',
     'name' => 'automattic/jetpack',
   ),
   'versions' => 
@@ -41,7 +41,7 @@ class InstalledVersions
       'aliases' => 
       array (
       ),
-      'reference' => 'c7ae731fceeb8e0c8cc5baa3da824e2e367e28a4',
+      'reference' => '6428a5a1a6218e890fb6c06b05bd26ee547368e7',
     ),
     'automattic/jetpack-a8c-mc-stats' => 
     array (

diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit177d36bca4c3386e5ed78deb0ab1700e
+class ComposerAutoloaderInita35837708a7acdd1ffb0e38ef898764f
 {
     private static $loader;
 
@@ -24,15 +24,15 @@ public static function getLoader()
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit177d36bca4c3386e5ed78deb0ab1700e', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInita35837708a7acdd1ffb0e38ef898764f', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit177d36bca4c3386e5ed78deb0ab1700e', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInita35837708a7acdd1ffb0e38ef898764f', '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\ComposerStaticInit177d36bca4c3386e5ed78deb0ab1700e::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInita35837708a7acdd1ffb0e38ef898764f::getInitializer($loader));
         } else {
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
@@ -44,19 +44,19 @@ public static function getLoader()
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit177d36bca4c3386e5ed78deb0ab1700e::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInita35837708a7acdd1ffb0e38ef898764f::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire177d36bca4c3386e5ed78deb0ab1700e($fileIdentifier, $file);
+            composerRequirea35837708a7acdd1ffb0e38ef898764f($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire177d36bca4c3386e5ed78deb0ab1700e($fileIdentifier, $file)
+function composerRequirea35837708a7acdd1ffb0e38ef898764f($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;