Merge remote-tracking branch 'origin/master'

williamdes · williamdes · commit b2555a4fe4ae · 2023-06-01T10:01:39.000+02:00
diff --git a/ChangeLog b/ChangeLog
@@ -51,6 +51,7 @@ phpMyAdmin - ChangeLog
 - issue #18314 Fix dragged row in index form
 - issue #17392 Fix the actions not being hidden in the Triggers, Routines, Events pages
 - issue #18441 Fix execute routine page not working when not in a modal
+- issue #18471 Fix SQL statement not being displayed correctly on RTL languages
 
 5.2.1 (2023-02-07)
 - issue #17522 Fix case where the routes cache file is invalid
diff --git a/public/themes/bootstrap/scss/_common.scss b/public/themes/bootstrap/scss/_common.scss
@@ -804,7 +804,6 @@ div.sqlvalidate {
   margin-bottom: 0;
   max-height: 10em;
   overflow: auto;
-  direction: ltr;
 }
 
 #PMA_slidingMessage code.sql,
diff --git a/public/themes/metro/scss/_common.scss b/public/themes/metro/scss/_common.scss
@@ -1064,7 +1064,6 @@ code {
     margin-bottom: 0;
     max-height: 10em;
     overflow: auto;
-    direction: ltr;
   }
 }
 
@@ -1076,7 +1075,6 @@ div.sqlvalidate,
   overflow: auto;
   background-color: $body-bg;
   border: 1px solid $border-color;
-  direction: ltr;
 }
 
 textarea#partitiondefinition {
diff --git a/public/themes/original/scss/_common.scss b/public/themes/original/scss/_common.scss
@@ -797,7 +797,6 @@ div.sqlvalidate {
   margin-bottom: 0;
   max-height: 10em;
   overflow: auto;
-  direction: ltr;
 }
 
 .result_query div.sqlOuter,
diff --git a/public/themes/pmahomme/scss/_common.scss b/public/themes/pmahomme/scss/_common.scss
@@ -990,7 +990,6 @@ div.sqlvalidate {
   margin-bottom: 0;
   max-height: 10em;
   overflow: auto;
-  direction: ltr;
 }
 
 .result_query div.sqlOuter {

Original file line number	Diff line number	Diff line change
`@@ -804,7 +804,6 @@ div.sqlvalidate {`
`804`	`804`	`margin-bottom: 0;`
`805`	`805`	`max-height: 10em;`
`806`	`806`	`overflow: auto;`
`807`		`- direction: ltr;`
`808`	`807`	`}`
`809`	`808`
`810`	`809`	`#PMA_slidingMessage code.sql,`
Original file line number	Diff line number	Diff line change
`@@ -1064,7 +1064,6 @@ code {`
`1064`	`1064`	`margin-bottom: 0;`
`1065`	`1065`	`max-height: 10em;`
`1066`	`1066`	`overflow: auto;`
`1067`		`- direction: ltr;`
`1068`	`1067`	`}`
`1069`	`1068`	`}`
`1070`	`1069`
`@@ -1076,7 +1075,6 @@ div.sqlvalidate,`
`1076`	`1075`	`overflow: auto;`
`1077`	`1076`	`background-color: $body-bg;`
`1078`	`1077`	`border: 1px solid $border-color;`
`1079`		`- direction: ltr;`
`1080`	`1078`	`}`
`1081`	`1079`
`1082`	`1080`	`textarea#partitiondefinition {`
Original file line number	Diff line number	Diff line change
`@@ -797,7 +797,6 @@ div.sqlvalidate {`
`797`	`797`	`margin-bottom: 0;`
`798`	`798`	`max-height: 10em;`
`799`	`799`	`overflow: auto;`
`800`		`- direction: ltr;`
`801`	`800`	`}`
`802`	`801`
`803`	`802`	`.result_query div.sqlOuter,`
Original file line number	Diff line number	Diff line change
`@@ -990,7 +990,6 @@ div.sqlvalidate {`
`990`	`990`	`margin-bottom: 0;`
`991`	`991`	`max-height: 10em;`
`992`	`992`	`overflow: auto;`
`993`		`- direction: ltr;`
`994`	`993`	`}`
`995`	`994`
`996`	`995`	`.result_query div.sqlOuter {`