gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,300 Commits 12 Branches 481 Tags 2.4 GiB
e02ae904c2
Commit Graph

18185 Commits

Author SHA1 Message Date
Madhura Jayaratne
e02ae904c2 Retrieve parameters from $_POST in database and table operation pages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-12-11 09:33:49 -05:00
Maurício Meneghini Fauth
51cade77fd Add secondary tabs for database query 
Fixes #13621 QBE selenium tests broken since merge of #13342

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-11 09:33:47 -05:00
Alessandro Dolci
ab52ee036d Fixed condition on the emptiness of enum type criteriaValues array (#14648) 
The if condition has a call to the empty function on the criteriaValues array, but in the considered case that array only contains a '0', so this makes it look empty to the function. I added a control on the first element of the array, to avoid this specific situation.
It's my first contribution, so I hope I did well with the branches. Let me know if there's something missing or to do, I'm happy to help.

Signed-off-by: Alessandro Dolci <alessandro.dolci@pm.me>
(cherry picked from commit 3f5fff3f4d)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-11 09:33:45 -05:00
Vincent Horváth
3ae1c0c5d8 Fix for #14636 - Move operation causes SELECT * FROM undefined 
- fixed params name in operation js file
- set value in global field table to new table name
- fixed refresh page after submit move table
- fixed back quote in message result

Signed-off-by: Vincent Horváth <win9400@gmail.com>
(cherry picked from commit 52024f1d2b)
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-11 09:33:44 -05:00
William Desportes
c987457a8a Fixes #14223 - designer error 
See: https://github.com/phpmyadmin/phpmyadmin/issues/14223#issuecomment-429312975
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-11 09:33:44 -05:00
yeezy69
3c9862ee67 Update Table.php (#14461) 
Fix #14447 - Error while copying database (pma__column_info)

Signed-off-by: Daniel <yeezy69@babau.mywire.org>
(cherry picked from commit aed0fede4d)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-11 09:33:44 -05:00
Maurício Meneghini Fauth
399f25a52e DatabaseInterface->getDefinition() can return false 
Related to https://github.com/phpmyadmin/website/issues/81

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-11 09:33:44 -05:00
William Desportes
13fd268fdd Fix #14438 - "Show Full Queries" icons 
Closes: #14438
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-11 09:33:44 -05:00
Rishwanth Yeddula
8b02617176 Ensure that database names with '.' are handled properly when DisableIS is true 
Closes: #13267

Signed-off-by: Rishwanth Yeddula <rish@cpanel.net>
(cherry picked from commit 1aed791258)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-11 09:33:43 -05:00
Jérôme Cognard
b4ca41c19d #14452 Remove hash param in edit query URL 
Signed-off-by: Jérôme Cognard <jerome.cognard@gmail.com>
(cherry picked from commit 5d0fae07a6)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-11 09:33:35 -05:00
Isaac Bennetch
1e5d2e902f Prepare for 4.8.4-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-12-11 09:33:35 -05:00
Isaac Bennetch
8bac4a931b Prepare for version 4.8.3 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-22 08:49:55 -04:00
Madhura Jayaratne
00d90b3ae4 Fix #14548 [security] HTML injection in import warning messages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-08-18 23:19:58 +10:00
Aswani Prakash
73b91caa22 drop table issue on copying tables fixed #14426 
Signed-off-by: Aswani Prakash <aswani15prakash@gmail.com>
(cherry picked from commit 8fc4d862a8)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-16 03:24:45 -03:00
Maurício Meneghini Fauth
ab488b6f5a
Merge pull request #14550 from williamdes/issue-14422-table-comment-bug 
Fixes #14422 - table comment not showing
 2018-08-15 01:10:21 -03:00
Isaac Bennetch
0294bcc5f2 Fix #14554 Icon missing for creating a new routine, trigger, and event 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-07 13:05:37 -04:00
Jack Cherng
d0233a047a Fix PHP 7.3 warning: "continue" in "switch" is equal to "break" 
Signed-off-by: Jack Cherng <jfcherng@gmail.com>
(cherry picked from commit 9a7a1e35b0)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-06 20:55:07 -03:00
Andy Baugh
c55755d0ca Fix merge conflicts in QA_4_8 from this pull request 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>

Fix bad callers to getError where null was being passed.

Fixes #14552: Considering how function signatures work in PHP, this should
be a reltatively 'safe' change, as the mysqli lib currently would still
do a check for cases where the passed in $link was either null or false.
Otherwise the bug's source appears to be a common mistake in PHP:
null != undefined

Signed-off-by: Andy Baugh <thomas.baugh@cpanel.net>
 2018-08-06 13:45:45 -04:00
William Desportes
8a7f2c30ef
Fix getDatabasesFull query 
Execute: $this->dbi->getDatabasesFull("pma_test")
Fixes missing space after alias

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-08-06 15:15:32 +02:00
William Desportes
b9d0c91350
Fixes #14422 - table comment not showing 
Closes: #14422
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-08-06 15:15:23 +02:00
Lakshay arora
b3017796b7 Fixes ERR_BLOCKED_BY_XSS_AUDITOR on export table 
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
(cherry picked from commit 91fa051918)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-03 17:35:08 -03:00
William Desportes
93ec29933b Fix - #14382 "Visualize GIS data" icon missing 
Closes: #14382
Signed-off-by: William Desportes <williamdes@wdes.fr>
(cherry picked from commit b3379d7700)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-04 20:42:32 -03:00
William Desportes
863badfdc2 Patch - missed instance of 'Avoid passing extension to Util::getImage' 
Patch for commit bed6fb4ebd

Fixes: #14390
Signed-off-by: William Desportes <williamdes@wdes.fr>
(cherry picked from commit ff4785cbf2)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-04 20:40:32 -03:00
William Desportes
71ae2b2e68 Fix for #14171 - 2FA QR PHPGD 
Closes: #14171
Signed-off-by: William Desportes <williamdes@wdes.fr>
(cherry picked from commit 49fae81505)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-04 19:54:54 -03:00
Lakshay arora
a747de1add Fixes issue with recent table list, #14229 
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>

(cherry picked from commit 727b40e00c)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 20:50:04 -03:00
Lakshay arora
b0ec6b69e9 Fix for #14314, error while naming a database '0' 
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
 2018-06-29 10:40:54 -04:00
Isaac Bennetch
42f36cce39 Prepare for version 4.8.3-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 13:41:45 -04:00
Isaac Bennetch
d363fa02c6 Prepare for version 4.8.2 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 11:50:09 -04:00
Michal Čihař
7662d02939 Avoid looking for ? when checking for file to be included 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-06-21 13:31:00 +02:00
William Desportes
632309bad8 Fixes #14370 
Fixes error when mysqli::fetch_array returns NULL for 'SELECT * FROM mytable WHERE 0;'

Signed-off-by: William Desportes <williamdes@wdes.fr>
(cherry picked from commit a9dce0b40e)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-13 21:36:10 -03:00
Isaac Bennetch
5d85c6d768 Prepare for 4.8.2-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-05-24 23:31:18 -04:00
Isaac Bennetch
a349504b0e Prepare for 4.8.1 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-05-24 22:37:57 -04:00
Isaac Bennetch
f2b068e1d3 Better fix for issue #14309 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-05-20 21:17:16 -04:00
Maurício Meneghini Fauth
54eb5ffff8 Fix Config\FormDisplayTemplateTest failed test 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-19 16:29:17 -03:00
Phoenix Eve Aspacio
e84c7f60e3 fixes broken links to icons in the setup page 
fixes broken links to icons in the setup page

Signed-off-by: Phoenix Eve Aspacio <aspaciop@phoenixpeca.xyz>
(cherry picked from commit bc1fee27be)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-19 14:56:08 -03:00
Aswani Prakash
9274c69693 #13893 issue fix Simulating queries produce unexpected results 
Signed-off-by: Aswani Prakash <aswani15prakash@gmail.com>
(cherry picked from commit 594cb7b1f2)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 19:33:39 -03:00
Xinyu Liu
f262c8cd7a fix: AUTO_INCREMENT error when only exporting table structure in database-level exports; issue #14066 
Signed-off-by: Xinyu Liu <meteor.lxy@foxmail.com>
(cherry picked from commit f1fa924f5f)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 14:55:59 -03:00
Lakshay arora
0da5857b5d Fix for issues with spatial fields (#14125) 
*  Fix for issues with spatial fields

Fixes the following issues:

1.    #14068 SPATIAL fields with no unique index/autoincrement error when clicking
      This error occurs when there is no unique column to uniquely identify a tuple. I've disabled the geomtery view and made view as wkt the default view in such cases.

2.    #14121 View spatial fields as WKT doesn't work

1.    #14067 IS NULL search operator produces no WHERE SQL with spatial fields

Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>

* Fix for issues with spatial fields
This commit fixes view as BINARY not working in the previous commit.
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>

* Fix for issues with spatial fields

Fixes typo in previous commits.

Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
(cherry picked from commit 9231620c2d)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-12 03:54:28 -03:00
Maurício Meneghini Fauth
de250fbae3 Fix MariaDB 10.2 current_timestamp() 
Fixes #13968 and fixes #13999. Closes #14177.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-08 07:39:53 -03:00
Madhura Jayaratne
e6cc4fbbbc Fix #14264 Linking for 'Distinct values' broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-05-08 07:10:06 +10:00
William Desportes
8f571f7e9e #14260 Fixed configuration for DefaultLang and Lang 
Closes: #14260
Signed-off-by: William Desportes <williamdes@wdes.fr>
(cherry picked from commit 2f84b4034e)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-06 21:16:36 -03:00
Madhura Jayaratne
7b27484897 Fix #14239 Line and some other charts ignore result set order of values chosen for the x-axis 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-05-06 08:59:06 +10:00
Piyush Vijay
b02220241f XML Export from single table throws fatal error (PHP 7.2): #14212 issue fixed 
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

(cherry picked from commit 5b35dba67d)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-04 02:44:41 -03:00
Maurício Meneghini Fauth
e7a6ff8a0e Remove duplicated input in application_configure.twig 
Some coding style fixes.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-03 13:40:33 -03:00
Raman Tehlan
3054999afe Display the secret for 2FA - #14128 (#14154) 
* 2FA Secret added
* 2FA Secret Displayed

Fix #14128

Signed-off-by: Raman Tehlan <ramantehlan@gmail.com>
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
(cherry picked from commit 8dbae11f6f)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-03 13:28:52 -03:00
William Desportes
8af0343bb2 Patch for issue #14246 
Signed-off-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-05-02 12:13:49 +02:00
Madhura Jayaratne
5872167dc2 Fix #14227 Relational linking broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-04-30 00:36:03 +10:00
Madhura Jayaratne
49e2a98158 Fix #14241 Dropping indexes and foreign keys fail 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-04-29 23:54:28 +10:00
Isaac Bennetch
2cc861f0a3 Prepare for 4.8.1-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-04-19 09:57:10 -04:00
Isaac Bennetch
236b5c9332 Prepare for version 4.8.0.1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-04-19 09:06:13 -04:00