Merge pull request #800 from skaut/version-2.10.3

Version 2.10.3
skaut · Jan 11, 2021 · b6cdbda · b6cdbda
2 parents 064d0b6 + cf8d083
commit b6cdbda
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -52,6 +52,7 @@
         "phpmd/phpmd": "^2.6",
         "phan/phan": "^4.0",
         "phpunit/phpunit": "^7.5",
-        "skaut/phan-wordpress-stubs": "^1.0.0"
+        "skaut/phan-wordpress-stubs": "^1.0.0",
+        "symfony/polyfill-mbstring": "^1.20.0 <1.22"
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/gulpfile.js b/gulpfile.js
@@ -284,7 +284,6 @@ gulp.task( 'build:deps:composer:other', function () {
 				'vendor/symfony/polyfill-intl-idn/bootstrap.php',
 				'vendor/symfony/polyfill-intl-idn/Idn.php',
 				'vendor/symfony/polyfill-mbstring/bootstrap.php',
-				'vendor/symfony/polyfill-mbstring/bootstrap80.php',
 				'vendor/symfony/polyfill-mbstring/Mbstring.php',
 			],
 			{ base: 'vendor/' }

diff --git a/src/php/class-api-facade.php b/src/php/class-api-facade.php
@@ -236,7 +236,7 @@ private static function list_files( $parent_id, $fields, $order_by, $pagination_
 			throw new \Sgdg\Exceptions\Unsupported_Value_Exception( $fields, 'list_files' );
 		}
 		if ( $fields->check( array( 'id', 'name' ) ) ) {
-			$mime_type_check = '(mimeType contains "' . $mime_type_prefix . '" or (mimeType = "application/vnd.google-apps.shortcut" and shortcutDetails.targetMimeType contains "' . $mime_type_prefix . '"))';
+			$mime_type_check = '(mimeType contains "' . $mime_type_prefix . '" or (mimeType contains "application/vnd.google-apps.shortcut" and shortcutDetails.targetMimeType contains "' . $mime_type_prefix . '"))';
 		} else {
 			$mime_type_check = 'mimeType contains "' . $mime_type_prefix . '"';
 		}