webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-28 07:41:55 +03:00
Code Activity
116,516 Commits 12 Branches 481 Tags
efbf84bdb18b0bbf89e9fc5bbe4f52cbbd359d7e
Commit Graph

19295 Commits

Author SHA1 Message Date
William Desportes
efbf84bdb1 Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 23:41:47 +01:00
William Desportes
823aad9ad6 Fix #15614 - Undefined offset on index page for MySQL 5.7.8 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 23:36:58 +01:00
William Desportes
567b39a623 Merge #15683 - Fix #15677 Show Processlist triggers exception 
Pull-request: #15683
Fixes: #15677
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 22:04:23 +01:00
Harsh Kukreja
d2d29ee45e Show Processlist triggers exception removed 
Signed-off-by: Harsh Kukreja <harshkukreja99@gmail.com>
 2019-12-21 21:55:10 +01:00
William Desportes
9633175165 Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 21:38:13 +01:00
William Desportes
f402a8f2cf Merge #15681 - Fix #15608 DisableIS is broken on pma 4.9.2 with controluser configured 
Fixes: #15608
Pull-request: #15681
Ref: 2bc8afea5f
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 21:34:05 +01:00
William Desportes
aa2f369bf3 Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 20:27:25 +01:00
William Desportes
774fc686bb Fix #15641 - Replication actions are not sent to a mysql link 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 19:29:20 +01:00
Maurício Meneghini Fauth
542ba3025a Fix control user issue 
Partially reverts commit 2bc8afea5f.

Fixes #15608
Related to #14433

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-21 14:56:59 -03:00
Maurício Meneghini Fauth
9d3f7519c9 Revert "Fix #14433 - "You do not have privileges to manipulate with the users!" on root superadmin" 
This reverts commit b8650115be.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-21 14:54:40 -03:00
William Desportes
d40f89ebd9 Fix a possible php7.4 error / failing tests 
"Trying to access array offset on value of type null"

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 16:38:21 +01:00
William Desportes
6e7e90169a Fix a possibly undefined index as reported to our server 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 16:38:21 +01:00
William Desportes
313da618bd Fix redirection form secure.php.net to www.php.net 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 11:03:10 +01:00
William Desportes
e1db42a0f6 Fix phpdoc for Sami 
Ref: #14345
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 11:03:07 +01:00
Maurício Meneghini Fauth
beb304c947 Fix coding standard error 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-20 21:25:09 -03:00
William Desportes
198bd239e8 Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-19 23:55:06 +01:00
William Desportes
56e8ebd8e9 Fix #15641 - Replication actions are not sent to a mysql link 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-19 23:48:25 +01:00
William Desportes
02304bcebf Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-18 21:48:27 +01:00
William Desportes
87a84b396c Merge #15653 - php 7.4 type error 
Fixes: #15640
Pull-request: #15653

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-18 21:46:26 +01:00
William Desportes
c01377b161 Fix undefined index for proxysql on @@version_comment and @@version 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-18 18:40:21 +01:00
Maurício Meneghini Fauth
4cbcf4889b Fix TypeError in Util class 
TypeError: str_replace() expects parameter 3 to be string or array, int given

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-17 22:37:14 -03:00
William Desportes
bed84bbf58 Add type-hints to prevent a type error 
Uncaught TypeError: Argument 1 passed to PhpMyAdmin\Message::notice() must be of the type string, object given

This error only occurs because of 4bb10d2ed3 that changed filter to apply

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-17 23:17:18 +01:00
William Desportes
850c125684 Fix #14732 Can't rename primary key with auto increment 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 23:46:35 +01:00
William Desportes
a993e36aca Merge #15659 - Fix #14732 Can't rename primary key with auto increment 
Pull-request: #15659
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 22:11:56 +01:00
Nikhil Nagdev
13e91a0e93 Fixed issue of renaming the primary key 
Signed-off-by: Nikhil Nagdev <nnagdev58@gmail.com>
 2019-12-17 02:22:46 +05:30
William Desportes
9f32a895b5 Fix #15435 - ReCAPTCHA couldn't find user-provided function: Functions.recaptchaCallback 
Fixes: #15435
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 21:30:22 +01:00
William Desportes
6f034732c3 Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 20:40:27 +01:00
William Desportes
94e30e9845 Add missing E_USER_DEPRECATED to Error handler 
Can be seen on 5.0 because "The "filter" tag in "home/index.twig" at line 18 is deprecated since Twig 2.9, use the "apply" tag instead."

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 20:40:11 +01:00
William Desportes
39fae3e84d Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 20:31:08 +01:00
William Desportes
52cef30384 Fix php 8.0 php notices - Undefined index 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 20:14:36 +01:00
R. Gurung
8dbd41ba3b changing !isset array index into null 
Signed-off-by: R. Gurung <gurungrahul2@gmail.com>
 2019-12-16 19:35:02 +01:00
Maurício Meneghini Fauth
b6233af781 Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-10 11:52:45 -03:00
Maurício Meneghini Fauth
1bae7c17d0 Add support for Amharic language 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-10 11:48:21 -03:00
William Desportes
5e271bd93b Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-09 21:16:43 +01:00
William Desportes
fd2b172365 Fix #15621 - Support CloudFront-Forwarded-Proto header 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-09 21:10:12 +01:00
William Desportes
59f5cdea43 Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-05 21:13:59 +01:00
William Desportes
b3a3e3fbe4 Merge #15613 - Fix #15571 Fatal error when trying to edit row with row checked and button under the table 
Pull-request: #15613
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-05 21:03:36 +01:00
William Desportes
08a6170e30 Fix tests and phpdoc for #15571 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-05 21:00:39 +01:00
Ashwin Ginoria
2dbe8f400b Removed 3rd Parameter to fix #15571 
Signed-off-by: Ashwin Ginoria <ashwinginoria@gmail.com>

Date:      Wed Dec 4 14:26:34 2019 +0530
 2019-12-04 14:27:03 +05:30
William Desportes
ff812e9366 Fix a merge mistake 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-24 18:05:59 +01:00
William Desportes
3ebcf62e78 Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-24 17:43:06 +01:00
William Desportes
99a8b4ea4d Fix php notice "undefined index table_create_time" when setting displayed columns on results of a view 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-24 17:35:32 +01:00
William Desportes
8f470aaa2f Fix #15592 - Hide user warning, errors and notices 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-24 17:14:22 +01:00
William Desportes
ecb5faac0c Fix #15434 - Add support for middle click on table sort column 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-24 17:07:37 +01:00
William Desportes
2f0fff5fa1 Fix #15592 - Add all errors since we do not have access to error_reporting function 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-24 17:07:04 +01:00
William Desportes
b6e1ea68f3 Fix issue reported by Scrutinizer 
It seems like ... can also be of type null; however, parameter $existrel_foreign of PhpMyAdmin\Table::updateForeignKeys does only seem to accept array

Link: https://scrutinizer-ci.com/g/phpmyadmin/phpmyadmin/inspections/72ec4952-c554-485c-b2f9-0898330b9368/issues/files/libraries/classes/Controllers/Table/RelationController.php?status=new&orderField=path&order=asc&honorSelectedPaths=0&issueId=42062672

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-24 15:56:54 +01:00
William Desportes
5f5dc024a1 Fix #15592 - Warning: error_reporting() has been disabled for security reasons 
Fixes: #15592
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-24 15:54:02 +01:00
William Desportes
dcc934b98a Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-24 15:26:41 +01:00
William Desportes
28d76482b8 Fix #15591 - Undefined index: foreign_keys_data 
Fixes: #15591

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-24 14:53:21 +01:00
Isaac Bennetch
8fbd20ba31 Prepare for version 4.9.3-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-11-23 06:48:13 -05:00