webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-11-01 23:14:58 +03:00
Code Activity
107,360 Commits 12 Branches 481 Tags
db4a2e11f473d169b41d00a6668dfd2742e8bd71
Commit Graph

52 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ř
8f74b63430 Merge branch 'QA_4_6' 2016-08-17 11:39:06 +02:00
Pavel Rochnyack
5a5ae580f2 Partitions editor: Allow to edit partition names; Add 'COLUMNS Partitioning' support. 
+ Add 'COLUMNS Partitioning' support
+ Allow to edit partition names
* Do not show duplicate partition names in 'Partition maintenance' snippet on 'Operations' tab. Caused by subpartitions presence.
* Optimize Partition::getPartitionMethod() - need only one row, so use 'LIMIT 1' in query to avoid much data transfer from database.
* Change HTML-code of partition comment textarea to avoid extra spaces added to value.
* Added missing htmlspecialchars() on subpartitions comment.

Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
 2016-08-14 12:26:01 +01: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ř
b33d7f4bd5 Merge branch 'QA_4_6' 2016-04-26 16:37:36 +02:00
Michal Čihař
df08b53e43 Fixed editing of VIEW structure 
Fixes #12171

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-26 16:37:20 +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
Atul Pratap Singh
ec38e05267 Merge pull request #12003 from ujjwalwahi/issue_11991 
Refactor TableSearchController
 2016-02-25 04:38:25 +05:30
Durgesh
0b64827930 Refactored url parmeters generating, Issue #11990 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-22 14:36:41 +05:30
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
33718de82f Fix #11923 Errors on Structure tab when user only has select access on certain columns 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-11 10:54:36 +11:00
Michal Čihař
41ab867fb7 Use builtin OpenLayers OSM setup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 15:07:47 +01:00
Michal Čihař
0252c13613 Fix class name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-14 09:43:57 +01:00
Michal Čihař
37004337ab Merge commit 'a478437e0ee4d74ec5036cb32e165da002303dd1' 2016-01-14 09:10:43 +01:00
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ř
a37273c5ba Initialize array variables 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 11:07:51 +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
Deven Bansod
cbb6e3eda0 Merge branch 'QA_4_5' 
Conflicts:
	po/eo.po
	po/li.po
	po/uz@latin.po
 2015-12-31 12:01:10 +05:30
Marc Delisle
86769cafaa Use more modern statement 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-12 07:40:58 -05:00
Madhura Jayaratne
bfcd37b84f Fix #11710 Unable to add/remove on update CURRENT_TIMESTAMP option while editing a timestamp field 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-02 17:16:50 +11:00
Deven Bansod
e2d0d2703a Include with correct filename 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-17 03:34:48 +05:30
Marc Delisle
ea2a7a324f Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-15 06:10:12 -05:00
Deven Bansod
c62672edd0 Merge branch 'QA_4_5' 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	po/cs.po
	po/fi.po
	po/it.po
	po/nb.po
	po/nl.po
	po/sv.po
 2015-11-12 23:49:31 +05:30
Marc Delisle
9cb51e7bb1 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-08 05:17:23 -08:00
Madhura Jayaratne
b31248fba4 Fix regression introduced while moving controllers 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-04 07:22:56 +11:00
Madhura Jayaratne
a701078e00 Move the controller to appropriate package 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-03 13:25:17 +11:00
Madhura Jayaratne
b6c1e4a08a These were for legacy browsers 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-03 12:12:28 +11:00
Madhura Jayaratne
098aef16f4 Merge branch 'QA_4_5' 2015-11-03 11:30:17 +11: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
6f4676cdfc Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-04 18:04:49 +02:00
Hugues Peccatte
e23bbdf2a6 Set namespaces on GIS classes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-12 22:33:15 +02:00
Hugues Peccatte
42c0ebac85 Merge branch 'master' into useNamespaces_master 2015-09-09 22:05:00 +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