Merge branch 'master' into develop

2 years ago · a12a9bab7a
parent 7c588fe9a3 21b510bf24
commit a12a9bab7a
2 changed files with 3 additions and 1 deletions
--- a/public/openapi/components/schemas/CommonProps.yaml
+++ b/public/openapi/components/schemas/CommonProps.yaml
@ -68,6 +68,8 @@ CommonProps:
                    type: string
                  as:
                    type: string
+                  noEscape:
+                    type: boolean
                  crossorigin:
                    type: string
                    enum: ['', 'anonymous', 'use-credentials']
--- a/public/src/admin/extend/plugins.js
+++ b/public/src/admin/extend/plugins.js
@ -342,7 +342,7 @@ define('admin/extend/plugins', [

 	function populateUpgradeablePlugins() {
 		$('#installed ul li').each(function () {
-			if ($(this).children('[data-action="upgrade"]').length) {
+			if ($(this).find('[data-action="upgrade"]').length) {
 				$('#upgrade ul').append($(this).clone(true));
 			}
 		});