1
0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-31 10:54:46 +03:00
Commit Graph

19 Commits

Author SHA1 Message Date
Michal Čihař
6cbcc319b1 Fix function name
Fixes #12505

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-09-26 13:41:33 +02:00
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ř
52586bd949 Merge branch 'QA_4_6-security' into master-security 2016-07-22 11:53:23 +02:00
Michal Čihař
ddeab2a11f Sanitize filename on SHP import
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-22 11:52:49 +02:00
Michal Čihař
2adf1ca83e Merge branch 'QA_4_6-security' into master-security 2016-07-22 11:35:14 +02:00
Michal Čihař
48764f2260 Delete temporary file before reporting error
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-22 11:31:56 +02:00
Michal Čihař
d85b701c9b Use ShapeFile library naming of shapes
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-24 16:16:12 +02:00
Michal Čihař
7d650bd548 Use phpmyadmin/shapefile instead of embedded bfShapeFile
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-24 15:52:40 +02:00
Michal Čihař
d4fdb95619 Adjust SHP file import to new code
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 17:59:42 +02:00
Michal Čihař
2c9deb0b62 Check zip file processing for errors
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 17:52:24 +02:00
Michal Čihař
bf2c76c1b1 Adjust tests to new import code
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 17:40:56 +02:00
Michal Čihař
dd09116716 Correct fix for table import processing
We need to consistently propagate the $sql_data array.

Issue #11850

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-02-17 11:12:08 +01:00
Michal Čihař
0c34cb60a0 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 13:47:04 +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
Hugues Peccatte
154a942145 Remove side effects in declaration files.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-10-27 18:56:40 +01:00
Hugues Peccatte
e1dd0a9f97 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-10-18 22:51:01 +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
330c92ddf7 Set namespace on properties classes.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-12 22:16:23 +02:00
Hugues Peccatte
fa801c507f Set namespace on plugins classes.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-12 12:51:45 +02:00