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

106339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
b03587fb8a Merge branch 'QA_4_6' 2016-06-20 17:25:03 +02:00
Michal Čihař
fac96d342f Share code for columns formatting 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 17:24:22 +02:00
Michal Čihař
bdb1e7af4e Clarify return value 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 17:21:23 +02:00
Michal Čihař
3606276e56 Remove unused method 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 17:19:59 +02:00
Michal Čihař
2a9123fe10 Define visibility for public methods 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 17:18:00 +02:00
Weblate
6c8c8de097 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-06-20 12:22:06 +02:00
Weblate
fb177bfbd6 Merge remote-tracking branch 'origin/master' 2016-06-20 12:22:04 +02:00
uncle_cat
0459089406 Translated using Weblate (Chinese (China)) 
Currently translated at 88.0% (2824 of 3209 strings)

[CI skip]
 2016-06-20 12:22:04 +02:00
uncle_cat
8c17e27962 Translated using Weblate (Chinese (China)) 
Currently translated at 87.7% (2816 of 3208 strings)

[CI skip]
 2016-06-20 12:22:00 +02:00
Michal Čihař
beb243949e Merge branch 'QA_4_6' 2016-06-20 12:21:48 +02:00
Michal Čihař
2674e503f2 Assign helperFunctions before doing extract 
This way we avoid possiblity of rewriting it from within the context.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 12:07:13 +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
Madhura Jayaratne
e7003792d9 Escape generated query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-06-18 09:13:02 +10:00
Michal Čihař
6897a5df53 Fix messages handling 
The first two messages were not used at all, now we concatenate them
all.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 17:21:31 +02:00
Michal Čihař
ef6b9e8120 Merge branch 'QA_4_6' 2016-06-17 17:13:08 +02:00
Michal Čihař
1a558a4190 Ensure id is numeric 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 17:12:41 +02:00
Michal Čihař
045046a1dc Document task to do 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 17:09:21 +02:00
Michal Čihař
bdfaaa4f40 Fix generated redirect response 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 15:00:44 +02:00
Michal Čihař
a6a78a2517 Merge branch 'QA_4_6' 2016-06-17 14:22:51 +02:00
Michal Čihař
61b4e28faf Sanitize page and formset before using 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 14:21:53 +02:00
Michal Čihař
8552da5842 Do not ignore error here 
The previous fetchAssoc would also fail in case of invalid resource.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 14:19:42 +02:00
Michal Čihař
8ac8ca1a02 Share code for parsing Proc_priv 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 14:17:31 +02:00
Michal Čihař
e25ab25d5f Define array before using it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 14:13:32 +02:00
Michal Čihař
cc6fd10b28 Add separator 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 14:04:21 +02:00
Michal Čihař
81e72439b6 Merge branch 'QA_4_6' 2016-06-17 14:00:15 +02:00
Michal Čihař
07216c9b8e Ensure that connection collation contains no HTML 
There is currently no MySQL collation which would do that, but just to
be safe.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 13:58:26 +02:00
Michal Čihař
04a72687f8 Add missing escaping 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 13:54:26 +02:00
Michal Čihař
dbd848d595 Fix wrong redirection tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 13:36:58 +02:00
Michal Čihař
e531526bc5 Merge branch 'QA_4_6' 2016-06-17 13:22:06 +02:00
Michal Čihař
58da975117 Add missing URL encoding 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 13:22:01 +02:00
Michal Čihař
170c045507 Simplify code for processing SQL query to display 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 13:21:01 +02:00
Michal Čihař
84507dfeb6 Merge branch 'QA_4_6' 2016-06-17 13:10:28 +02:00
Michal Čihař
a5950f9ecd Fix link to mariadb explain analyzer 
- avoid double urlencoding of the query
- properly escape html entities

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 13:05:11 +02:00
Michal Čihař
d1ec59f05f Ensure we have integer as offset 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 13:01:56 +02:00
Michal Čihař
aef5df7e13 Ensure we have integer as position 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 13:00:45 +02:00
Michal Čihař
325122658a Fix parameter type documentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 12:59:37 +02:00
Michal Čihař
8bf3cf6578 Use URL::getCommon to construct complete URL 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 12:58:14 +02:00
Michal Čihař
dce94f229f More consistency for URL::getCommon 
Now URL::getCommon always returns HTML encoded string, if you want
unencded one, use URL::getCommonRaw. This makes it easier to review the
code if uses correct variant.

Also I've fixed several wrong uses of the HTML encoded variant in
Location header.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 12:44:29 +02:00
Michal Čihař
41d5c1e127 Merge branch 'QA_4_6' 2016-06-17 11:44:30 +02:00
Michal Čihař
009148075f PMA_jsFormat accepts only strings 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 11:43:51 +02:00
Michal Čihař
cdc7a6c6bf Merge branch 'QA_4_6' 2016-06-17 11:23:25 +02:00
Michal Čihař
4a9da1df40 Adjust tests to new error reporting handling of objects 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 11:23:20 +02:00
Michal Čihař
3847cee0a4 Merge branch 'QA_4_6' 2016-06-17 11:20:05 +02:00
Michal Čihař
f5e8953356 Share backtrace processing for debugging and error reporting 
We want to achieve same thing in both cases - backtrace which is
stripped from sensitive information, has reasonable size and can be
read. Sharing the code will make it easier to fix possible problems and
also will make both cases behave consistent.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 11:18:39 +02:00
Michal Čihař
aea7654804 Merge branch 'QA_4_6' 2016-06-17 11:04:35 +02:00
Michal Čihař
ee0955b30b Use same condition for link start as for link end 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 11:04:28 +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
Michal Čihař
eb942e68b9 Merge branch 'QA_4_6' 2016-06-16 16:18:02 +02:00