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

104399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
c9b0935e7d Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 12:18:05 +01:00
Michal Čihař
3c90f45020 Simplify shape record loading 
We can use foreach with reference to simplify the code.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 12:18:05 +01:00
Michal Čihař
7f9333c3e1 Add second test for shape file import 
This one contains multipolygons to test more complex things.

The data is based on OpenStreetMap, licensed under ODbL 1.0.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 12:18:05 +01:00
Michal Čihař
941325eb18 Close file only if it is opened 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 12:18:05 +01:00
Michal Čihař
65555e51d5 Ensure test can be executed separately 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 12:18:05 +01:00
Atul Pratap Singh
5ba197dc70 Merge branch 'QA_4_5' 2016-01-05 16:36:51 +05:30
Atul Pratap Singh
e4c194ccde Fix #11821 TypeError: $this_function.val(...) is null 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-01-05 16:32:22 +05:30
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ř
c2ea3bcc7d Build output in less steps 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 10:52:44 +01:00
Michal Čihař
4a3f055527 Free result only if it exists 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 09:12:19 +01:00
Michal Čihař
ea8382efcd Do not use case insensitive char for symbols lookup 
These only add performance penatly at no benefit.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 09:09:57 +01:00
Michal Čihař
7973c2986e Better handle parse errors in GIS 
The mb_stripos can return false and we should handle it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 09:08:29 +01:00
Michal Čihař
05b264564e Simplify indentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 09:07:29 +01:00
Michal Čihař
e0b1c1643e Close should not fail if open didn't 
Hiding error on close is not needed, this should not happen unless the
system is really in a bad shape.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 09:05:01 +01:00
Michal Čihař
b66c189caf Document todo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 09:03:00 +01:00
Michal Čihař
a7d2473025 Avoid ignoring error 
There should be no error here as we've queried the result few lines ago.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 08:57:25 +01:00
Michal Čihař
592207946e Merge branch 'QA_4_5' 2016-01-05 08:38:19 +01:00
Michal Čihař
cedc7a442c Fix hiding of page content behind menu 
We use jQuery to to the initializaton rather than directly overwriting
onload, which breaks other things,

Fixes #11820, #11812

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 08:35:57 +01:00
Weblate
e23ad2e57d Merge remote-tracking branch 'origin/master' 2016-01-05 08:23:16 +01:00
Masahiro Nishi
70b04acf37 Translated using Weblate (Japanese) 
Currently translated at 66.6% (2144 of 3217 strings)

[CI skip]
 2016-01-05 08:23:14 +01:00
Michal Čihař
991df753c7 Merge branch 'QA_4_5' 2016-01-05 08:21:42 +01:00
Michal Čihař
e1c9dec998 Merge commit '912f96114dc803404e2854ebb5796757a4eeedb6' 2016-01-05 08:21:32 +01:00
Michal Čihař
6d83b09840 Merge commit 'b16bec706a99b3058a14baffeef58470e59200a9' 2016-01-05 08:20:52 +01:00
Weblate
d6291c2f8f Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-05 08:19:46 +01:00
Masahiro Nishi
e9d3ef465f Translated using Weblate (Japanese) 
Currently translated at 67.4% (2166 of 3210 strings)

[CI skip]
 2016-01-05 08:19:44 +01:00
Michal Čihař
912f96114d Merge pull request #11815 from nijel/dot-database 
Fix handling of databases with dot in a name
 2016-01-05 08:19:39 +01:00
Kiguda Kosuru
85d58a7fe8 Translated using Weblate (Japanese) 
Currently translated at 65.9% (2121 of 3217 strings)

[CI skip]
 2016-01-05 01:51:01 +01:00
Kiguda Kosuru
b16bec706a Translated using Weblate (Japanese) 
Currently translated at 66.7% (2143 of 3210 strings)

[CI skip]
 2016-01-05 01:50:55 +01:00
Michal Čihař
c197c3fba5 Fix handling of databases with dot in a name 
We do not need to concatenate and parse the items, the cache backend
accepts array directly.

Fixes #11798

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-04 17:06:58 +01:00
Michal Čihař
66234c4521 Merge pull request #11768 from nijel/overload 
Remove /*overload*/ prefix from mb_* calls
 2016-01-04 16:57:06 +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
41caf7bafa Merge branch 'QA_4_5' 2016-01-04 19:43:01 +05:30
Deven Bansod
63fae992d8 ChangeLog entry for issue #11727 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-01-04 19:42:23 +05:30
Paweł Kubrak
f1b3beca14 Fix #11727 : SQL duplicate entry error trying to INSERT in designer_settings table 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-01-04 19:40:38 +05:30
Atul Pratap Singh
0b5e8fd6a3 Move onload navigation state update into AJAX.registerOnload to avoid a glitch 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-01-04 19:19:49 +05:30
Marc Delisle
49302ec644 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-04 07:40:11 -05:00
Atul Pratap Singh
e9ec1edaa1 Merge branch 'QA_4_5' 2016-01-04 17:27:54 +05:30
Atul Pratap Singh
5b76c5eddf Fix #11812 Uncaught TypeError: Cannot read property 'parentNode' of null 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-01-04 17:26:15 +05:30
Madhura Jayaratne
727b965bbf Merge branch 'QA_4_5' 2016-01-04 17:10:56 +11:00
Madhura Jayaratne
d9dc442050 issue #11810 'Add to central columns' (per column button) does nothing 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-04 17:08:12 +11:00
Marc Delisle
6f713baa49 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-03 08:57:26 -05:00
Marc Delisle
3b00a228f2 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-02 10:57:26 -05:00
Marc Delisle
128b4195b1 Merge pull request #11803 from Achilles-96/Issue-11730 
Bug fix for #11746
 2016-01-02 10:46:15 -05:00
Achilles-96
fbe8fbb362 Bug fix for #11746 
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2016-01-02 20:18:35 +05:30
Marc Delisle
a68ae54bde Merge branch 'QA_4_5' 2016-01-02 08:51:25 -05:00
Weblate
464c31b7ce Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-02 14:51:14 +01:00
Sebastian Weremczuk
31faecba45 Translated using Weblate (Polish) 
Currently translated at 84.1% (2700 of 3210 strings)

[CI skip]
 2016-01-02 14:51:13 +01:00
Bob
c0fca35406 Translated using Weblate (Korean) 
Currently translated at 78.5% (2520 of 3210 strings)

[CI skip]
 2016-01-02 14:51:12 +01:00
Marc Delisle
59fe5e234d Undefined index: host 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-02 08:51:04 -05:00