[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 4512ad: Fix php error when creating a relation between a table and a view in Designer

William Desportes williamdes at wdes.fr
Tue Jan 14 22:54:18 CET 2020


Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 4512ada9eb387ee89c2cdf077c27f8a028662a75
https://github.com/phpmyadmin/phpmyadmin/commit/4512ada9eb387ee89c2cdf077c27f8a028662a75
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-01-12 (Sun, 01 January 2020) +01:00

Changed paths: 
M libraries/classes/Database/Designer/Common.php

Log Message:
-----------
Fix php error when creating a relation between a table and a view in Designer

Yes, that does not make sense but it should not throw and error
"Uncaught TypeError: mb_strtoupper() expects parameter 1 to be string"

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: f14d675308f604fd3f6f6fecb1b6189b7720ad47
https://github.com/phpmyadmin/phpmyadmin/commit/f14d675308f604fd3f6f6fecb1b6189b7720ad47
Author: Jayati Shrivastava <gaurijove at gmail.com>
Date: 2020-01-12 (Sun, 01 January 2020) +01:00

Changed paths: 
M js/functions.js
M libraries/classes/Controllers/Table/StructureController.php

Log Message:
-----------
revert change introduced by pr #15718 and fix #15718

Signed-off-by: Jayati Shrivastava <gaurijove at gmail.com>

Commit: e93005fd58285c4455463b28073edab7678c016e
https://github.com/phpmyadmin/phpmyadmin/commit/e93005fd58285c4455463b28073edab7678c016e
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-01-12 (Sun, 01 January 2020) +01:00

Changed paths: 
M js/functions.js
M libraries/classes/Controllers/Table/StructureController.php

Log Message:
-----------
Merge #15744, #15743 - Fix - #15717 

Pull-request: #15744
Closes: #15743
Fixes: #15717
Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: c6206a301d6af445bd2e73d306d0b74bacf51ce0
https://github.com/phpmyadmin/phpmyadmin/commit/c6206a301d6af445bd2e73d306d0b74bacf51ce0
Author: Tabraiz <smart.taby at gmail.com>
Date: 2020-01-12 (Sun, 01 January 2020) +01:00

Changed paths: 
M db_designer.php
M libraries/classes/Database/Designer/Common.php

Log Message:
-----------
Fix for page name already existing in designer page names

Signed-off-by: Tabraiz Malik <tabraizmalik96 at gmail.com>

Commit: 01b9881799bdec22d77f31c8811951e78acf908b
https://github.com/phpmyadmin/phpmyadmin/commit/01b9881799bdec22d77f31c8811951e78acf908b
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-01-12 (Sun, 01 January 2020) +01:00

Changed paths: 
M db_designer.php
M libraries/classes/Database/Designer/Common.php

Log Message:
-----------
Merge #15770 - Fix #15432 names of the pages in the designer should be unique

Pull-request: #15770
Fixes: #15432
Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: e54361142665b6c4b44b752d86a759635c84d9ab
https://github.com/phpmyadmin/phpmyadmin/commit/e54361142665b6c4b44b752d86a759635c84d9ab
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-01-12 (Sun, 01 January 2020) +01:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Add ChangeLog entry for #15432

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: aa95fff91914e2b02856431961ba6378dfc57514
https://github.com/phpmyadmin/phpmyadmin/commit/aa95fff91914e2b02856431961ba6378dfc57514
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-01-12 (Sun, 01 January 2020) +01:00

Changed paths: 
M libraries/classes/Server/Privileges.php
M server_privileges.php

Log Message:
-----------
Fix #15776 - privileges page return http 500

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: f7eb2b9755388b404cec4956998eb519aee24ff9
https://github.com/phpmyadmin/phpmyadmin/commit/f7eb2b9755388b404cec4956998eb519aee24ff9
Author: Manthan Surkar <manthan.surkar at gmail.com>
Date: 2020-01-13 (Mon, 01 January 2020) +05:30

Changed paths: 
M js/functions.js

Log Message:
-----------
Unwanted button hide by see more Button in Pick Central Column removed

Signed-off-by: Manthan Surkar <manthan.surkar at gmail.com>

Commit: 8bf2f03c740eb935b021fb8c6193bfb20159ed94
https://github.com/phpmyadmin/phpmyadmin/commit/8bf2f03c740eb935b021fb8c6193bfb20159ed94
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-01-13 (Mon, 01 January 2020) +01:00

Changed paths: 
M js/functions.js

Log Message:
-----------
Merge #15783 - Fix #14310 Column selector "See more" removes "Preview SQL" and "Save" area

Pull-request: #15783
Fixes: #14310
Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: 56b40adc44a75f08f75007587a16490f759698f8
https://github.com/phpmyadmin/phpmyadmin/commit/56b40adc44a75f08f75007587a16490f759698f8
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-01-13 (Mon, 01 January 2020) +01:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Add ChangeLog entry for #14310

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: a85af1084575737d413f34b2686295582ee6cc66
https://github.com/phpmyadmin/phpmyadmin/commit/a85af1084575737d413f34b2686295582ee6cc66
Author: Maurício Meneghini Fauth <mauricio at fauth.dev>
Date: 2020-01-14 (Tue, 01 January 2020) -03:00

Changed paths: 
M ChangeLog
M js/table/select.js

Log Message:
-----------
Fix wrong jQuery function call in table search page

Signed-off-by: Maurício Meneghini Fauth <mauricio at fauth.dev>

Commit: c5481acebf238d170018c4772ca747ee1a222565
https://github.com/phpmyadmin/phpmyadmin/commit/c5481acebf238d170018c4772ca747ee1a222565
Author: Maurício Meneghini Fauth <mauricio at fauth.dev>
Date: 2020-01-14 (Tue, 01 January 2020) -03:00

Changed paths: 
M ChangeLog
M js/functions.js
M js/table/select.js
M libraries/classes/Controllers/Database/DesignerController.php
M libraries/classes/Controllers/Server/PrivilegesController.php
M libraries/classes/Controllers/Table/StructureController.php
M libraries/classes/Database/Designer/Common.php
M libraries/classes/Server/Privileges.php

Log Message:
-----------
Merge branch 'QA_5_0'

Signed-off-by: Maurício Meneghini Fauth <mauricio at fauth.dev>



More information about the Git mailing list