1
0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Commit Graph

10049 Commits

Author SHA1 Message Date
Isaac Bennetch
292c0a1ff9 Fix merge conflicts
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2016-06-23 02:43:30 -04:00
Isaac Bennetch
58534ce2fc Prepare for 4.6.4-dev
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2016-06-23 02:40:42 -04:00
Isaac Bennetch
4f57305eab Release 4.6.3
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2016-06-23 00:27:15 -04:00
Isaac Bennetch
f7d1c1f463 Changelog entries for security release
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2016-06-22 23:53:56 -04:00
Michal Čihař
b73175ed12 Merge branch 'master' into master-security 2016-06-20 10:43:21 +02:00
Madhura Jayaratne
221c5f9246 Merge branch 'QA_4_6' 2016-06-18 09:20:44 +10:00
Madhura Jayaratne
040822fe5a ChangeLog entry for e7003792d9
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-06-18 09:19:00 +10:00
Michal Čihař
791bdafcdd Merge branch 'QA_4_6-security' into master-security 2016-06-17 16:24:39 +02:00
Michal Čihař
6c5d5ffc7f Merge branch 'QA_4_6' into QA_4_6-security 2016-06-17 09:02:13 +02:00
Michal Čihař
c3ae85b2e1 Merge branch 'QA_4_6' 2016-06-17 08:55:48 +02:00
Michal Čihař
c00fe2cbfd Fix listing routines for non privileged user
We first need to check if we can read the definition before parsing it.

Fixes #12310

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-17 08:55:04 +02:00
Isaac Bennetch
07147d174c Setup script icons broken
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2016-06-14 23:42:45 -04:00
Isaac Bennetch
d76496ba1d Setup script did not properly use input type password in all cases
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2016-06-14 22:53:31 -04:00
Michal Čihař
136b85fc97 Produce valid JSON on export
The JSON export now generates valid JSON data, but this means that the
resulting JSON format has changed.

Fixes #12307

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-14 09:16:58 +02:00
Michal Čihař
25ede08182 Merge branch 'QA_4_6' 2016-06-14 08:30:03 +02:00
Michal Čihař
79a34ff94c Calculate table size as integer
It should be big enough on 64-bit systems, so avoid rounding issues
which double calculations can bring.

Fixes #12303

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-14 08:28:26 +02:00
Michal Čihař
8a0e39228f Merge branch 'QA_4_6' 2016-06-13 12:55:08 +02:00
Michal Čihař
b5faeb3c27 Fixed editing of server variable
We now store verbatim variable name in HTML to avoid need to do some
magical transformations when parsing it.

Fixes #12317

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-13 12:53:34 +02:00
Michal Čihař
cff938e15b Merge branch 'QA_4_6' 2016-06-09 09:49:41 +02:00
Michal Čihař
3c6675b3f9 Fix division by zero in case of misconfigured MySQL server
Fixes #12308

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-09 09:49:13 +02:00
Madhura Jayaratne
d4932fbb88 Merge branch 'QA_4_6' 2016-06-06 23:59:21 +10:00
Madhura Jayaratne
c4e7447a96 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into bug12281
Conflicts:
	ChangeLog
2016-06-06 23:23:07 +10:00
Madhura Jayaratne
1c77a4ef0d Fix #12281 Copying a user resets SSL to None
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-06-06 23:17:20 +10:00
Michal Čihař
7a66320753 Merge branch 'QA_4_6' 2016-06-06 13:54:53 +02:00
Michal Čihař
4fd2709650 Avoid rewriting PHP stack frames
Surprisingly PHP stack frames are passed as references to the error
handling code, thus changing value there leads to changing value in the
executed code.

With MySQL issuing warning about incompatible version (different runtime
library than compile time), handling this warning rewrites current stack
frame and the mysql_real_connect later sees parameters as processed by
Error class for display.

We now create copy of the stacktrace to avoid this.

Fixes #12279

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-06 13:52:32 +02:00
Michal Čihař
8ee70dfa08 Merge branch 'QA_4_6' 2016-06-06 09:33:22 +02:00
Michal Čihař
171bcb9a85 Fix MySQL SSL connection with some PHP versions
It seems that for some PHP versions this flag is needed even though it's
not documented like this. Anyway this flag doesn't cause any harm, so
lets keep it enabled.

Issue #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-06 09:32:47 +02:00
Madhura Jayaratne
dac90ecb03 Merge branch 'QA_4_6' 2016-06-05 11:13:34 +10:00
Madhura Jayaratne
aec1f4b3c5 Fix #12285 Designer JavaScript error: Show/Hide tables list
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-06-05 11:12:05 +10:00
Michal Čihař
8a494f26d2 Merge branch 'QA_4_6' 2016-06-03 14:42:07 +02:00
Michal Čihař
b49030528f Fixed export of tables without explicitly set engine
Fixes #12290

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-03 14:41:55 +02:00
Michal Čihař
e9614da53a Merge branch 'QA_4_6' 2016-06-03 14:32:00 +02:00
Michal Čihař
d11185f5de Fixed error reporting on connect problems
The mysqli_real_connect seems to return NULL on invalid parameters, so
we need to handle it as well. This doesn't seem to be documented
anywhere.

Issue #12279

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-03 14:24:45 +02:00
Isaac Bennetch
277e90f977 Merge pull request #12270 from Gregory-Buhler/ISSUE_#12233
Error message improved when user tries to rename database to same name.
2016-05-28 10:10:00 -04:00
Michal Čihař
ab29ec9947 Merge branch 'QA_4_6' 2016-05-27 11:12:58 +02:00
Michal Čihař
d78e173b34 Do not use dirname for calculating cookie path
It is wrong for this purpose as on Windows this uses \ for both
separating parts and generating result. This fixed calculation of cookie
path on Windows.

Fixes #12249

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-27 11:11:56 +02:00
Gregory-Buhler
e1eed3ed43 Fixes #12233 Error message improved when user tries to rename database to
same name. Added new functionality to PMA_ajaxShowMessage() allowing for
different notification types.

Signed-off-by: Gregory-Buhler <webmaster@gregorybuhler.com>
2016-05-26 09:54:39 -06:00
Isaac Bennetch
de030c88ce Fix merge conflicts from preparing for 4.6.3
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2016-05-25 14:43:07 -04:00
Isaac Bennetch
5c6ec27eea Prepare for 4.6.3-dev
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2016-05-25 14:36:58 -04:00
Isaac Bennetch
35e191d74b Changelog for PMASA-2016-14 and -16
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2016-05-25 13:00:26 -04:00
Isaac Bennetch
c1c75f8c35 4.6.2 release
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2016-05-25 12:16:14 -04:00
Michal Čihař
8ba932da58 Merge branch 'QA_4_6' 2016-05-23 17:38:00 +02:00
Michal Čihař
e1f8c36c79 Fix class namespace
Fixes loading of APC based upload progress bar

Fixes #12248

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 17:37:38 +02:00
Michal Čihař
4cd8ab8a95 Better report errors while generating SQL exports
The errors will include table and database name in the dump and the
error is also shown in the UI on next page.

Fixes #5555

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 17:21:58 +02:00
Michal Čihař
40b80d883d Merge branch 'QA_4_6' 2016-05-23 17:16:35 +02:00
Michal Čihař
66f774787f Do not fail on errors stored in session
If there is user error stored in session, it would be treated as session
startup error, what is wrong.

Fixes #12229

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 17:15:23 +02:00
Michal Čihař
a15a847ade Add support for export user settings as config.inc.php snippet
Fixes #6274

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 16:35:03 +02:00
Michal Čihař
d7d9925e11 Merge branch 'QA_4_6' 2016-05-23 16:10:34 +02:00
Michal Čihař
ec11ed59be Add session reload for config authentication
It is for free with new logout handling (since
11eb574242).

Fixes #11565

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 16:10:07 +02:00
Michal Čihař
1d1e269144 Merge branch 'QA_4_6' 2016-05-23 15:54:33 +02:00