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

30 Commits

Author SHA1 Message Date
Michal Čihař
fd2215c469 Merge branch 'QA_4_6' 2016-09-22 09:48:22 +02:00
Deven Bansod
2d69d40fa2 Fix error in adcaf7c 
Fix #12382

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-22 12:01:47 +05:30
Deven Bansod
fe05fdaa56 Merge branch 'QA_4_6' 2016-09-21 21:27:15 +05:30
Deven Bansod
adcaf7ca4b Use intval to prevent XSS instead, and use numeric to check valid datatype 
Fix #12382

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-21 21:24:00 +05:30
Michal Čihař
3546bed47e Avoid using mb_strlen for checking whether string is empty 
Using strlen produces same results here, just way faster.

Fixes #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 10:29:21 +02:00
Michal Čihař
1c08750785 Merge branch 'QA_4_6' 2016-06-24 12:58:45 +02:00
Michal Čihař
f204208540 Move count() call outside loop 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-24 12:58:35 +02:00
Michal Čihař
637d4eb4de Merge branch 'QA_4_6-security' into master-security 2016-06-20 17:35:46 +02:00
Michal Čihař
4bcc606225 Always use delimiter not present in search expression 
This avoids need to figure out correct escaping in case delimiter is
present in the expression.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 12:03:44 +02:00
Michal Čihař
3e2029e750 Move MySQL charsets handling to the Charsets class 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 12:55:42 +02:00
Madhura Jayaratne
5f2c866fcb Merge branch 'QA_4_6' 2016-03-10 19:18:10 +11:00
Madhura Jayaratne
86b9067969 Fix #12085 Like search strings being escaped incorrectly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-10 19:16:54 +11:00
Madhura Jayaratne
263bd601e6 Remove bookmark library includes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-09 23:57:09 +11:00
Michal Čihař
2c256da5e8 Merge commit '73fd0dc2a8f5471c717a887aae22bde97bc5498f' 2016-03-01 07:45:58 +01:00
Michal Čihař
a29f154f37 Merge branch 'MAINT_4_5_5-security' into QA_4_6-security 2016-02-29 10:35:47 +01:00
Ujjwal Wahi
940f249595 Refactor TableSearchController 
Fixes #11991
Signed-off-by: Ujjwal Wahi w.ujjwal@gmail.com
 2016-02-21 19:02:21 +05:30
Madhura Jayaratne
f2a60e54f4 canvg.js does not seem to be used anymore 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-14 14:05:03 +11:00
Madhura Jayaratne
56f684e466 Move common code inside the method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-14 13:09:55 +11:00
Michal Čihař
f4eb1a9b4f There is no need to reset() before foreach() 
The code is there since past when PHP 4 was still supported reset was
necessary.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 11:26:34 +01:00
Michal Čihař
55b317c699 Remove /*overload*/ prefix from mb_* calls 
I believe this was temporary flagging to see which code is migrated and
can be safely removed now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-04 16:35:28 +01:00
Marc Delisle
86769cafaa Use more modern statement 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-12 07:40:58 -05:00
Marc Delisle
ea2a7a324f Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-15 06:10:12 -05:00
Marc Delisle
9cb51e7bb1 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-08 05:17:23 -08:00
Marc Delisle
b49a746d35 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-25 09:54:07 -04:00
Marc Delisle
faaec8e9f4 Refactor high-level parser calling into a function 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-22 12:07:45 -04:00
Hugues Peccatte
9698d301f8 Fix #11550 Regression in Find and replace 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-18 22:14:20 +02:00
Hugues Peccatte
6c594eb0cf Fix calls. 
Remove useless PHPDoc.
Add missing require.
Add missing 'use'.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-05 22:58:47 +02:00
Hugues Peccatte
32fd26ad42 Merge branch 'master' into useNamespaces_master 2015-09-02 21:48:40 +02:00
Hugues Peccatte
49e9dd1f13 Fix wrong rename. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 22:20:00 +02:00
Hugues Peccatte
5207ba43a7 Update controllers' namespace. 
Move table controllers into 'table' folder.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:56:14 +02:00