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

105697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
ad4e55e0f7 Merge branch 'QA_4_6' 2016-04-06 16:04:51 +02:00
Michal Čihař
659c89e464 Update SQL Parser to 8de4749d803858859fcf7a39b1bbf058745920f0 
See #12165

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 16:04:35 +02:00
Michal Čihař
a5bcab5592 Make warning a bit stronger 
Obviously users are doing this for ages and are surprised that the old
script doesn't work with new code.

Issue #12159

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 15:18:42 +02:00
Michal Čihař
6d480f6791 Merge branch 'QA_4_6' 2016-04-06 14:06:37 +02:00
Michal Čihař
7de636d826 Fix PHP error if user did unpack new version over old one 
By doing stricter check on filename, we avoid old classes which break
autoloader.

Fixes #12159

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 14:05:49 +02:00
Michal Čihař
2c1b18a75b Merge branch 'QA_4_6' 2016-04-06 13:52:07 +02:00
Michal Čihař
7413208ce7 Merge pull request #12157 from nijel/ssl 
Simplify SSL setup
 2016-04-06 13:51:24 +02:00
Michal Čihař
e875d4b50b Adjust tracking test to new code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 11:58:20 +02:00
Michal Čihař
b67febe3b0 Simplify fetching tracking status 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 11:37:46 +02:00
Michal Čihař
5d37731854 Merge branch 'QA_4_6' 2016-04-06 11:29:49 +02:00
Michal Čihař
73278068a9 Adjust tests to simplified DatabaseStructureController 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 11:29:43 +02:00
Michal Čihař
f42674aa0f Better document why these aliases are needed 
It's no longer for MySQL forward compatibility, but rather for
possibility to switch between SHOW TABLES and INFORMATION_SCHEMA using
DisableIS directive.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 11:05:31 +02:00
Michal Čihař
635f83a634 Remove unused method 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 11:04:25 +02:00
Michal Čihař
319441274c Share code for getting table status 
This way it correctly respects DisableIS setting.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 11:03:33 +02:00
Michal Čihař
6c712a3c15 Revert "Remove compatibility code with MySQL < 5.0" 
This is still needed

Fixes #12161

This reverts commit edd264c91f.
 2016-04-06 10:55:38 +02:00
Michal Čihař
fdd6d3105d Merge branch 'QA_4_6' 2016-04-06 10:39:17 +02:00
Michal Čihař
96a2e3e35a Avoid using globals for things we have as class attribute 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 10:39:10 +02:00
Michal Čihař
412af774ba Avoid using superglobal 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 10:36:20 +02:00
Michal Čihař
d99c4f357d Merge branch 'QA_4_6' 2016-04-06 10:32:36 +02:00
Michal Čihař
e009217f43 Fix check for system schema 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 10:32:28 +02:00
Michal Čihař
298efcf139 Merge branch 'QA_4_6' 2016-04-06 10:19:37 +02:00
Michal Čihař
ec984877d8 Improve performance of database structure page 
There is no need to get full list of tables twice, it's enough to do it
in the controller itself.

Fixes #12129

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 10:17:56 +02:00
Michal Čihař
f58349481d Avoid destroying already initalized gettext variables 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 10:13:40 +02:00
Michal Čihař
d8d9ab421e Always set correct sub_part request 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 09:59:22 +02:00
Michal Čihař
c136a74705 Cache current user information for DBI lifetime 
We query this information quite often, so it makes sense to fetch it
only once from the MySQL server.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 09:45:53 +02:00
Michal Čihař
354a434838 Merge branch 'QA_4_6' 2016-04-06 08:48:26 +02:00
Michal Čihař
51b5a236c7 Fix check for not set domain 
Fixes #12154

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 08:47:50 +02:00
Michal Čihař
69e59c5987 Fix underline 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-05 10:23:44 +02:00
Michal Čihař
c3afee6235 Merge branch 'QA_4_6' 2016-04-05 10:05:46 +02:00
Michal Čihař
1580d2fa4d Fixed SQL quoting in SQL export 
The fix for 4.5 branch was wrongly merged here.

Fixes #12029

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-05 10:05:22 +02:00
Michal Čihař
66c0fbd631 Simplify SSL setup 
Simplify setup to follow current PHP documentation:

- the MYSQLI_CLIENT_SSL flag should not be needed
- there is mysqli_option flag to turn of certificate verification
- remove check for defined constants, all should be there in PHP
  versions we support

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-05 09:57:52 +02:00
Michal Čihař
d0c6d18bfa Merge branch 'QA_4_6' 2016-04-05 09:48:38 +02:00
Weblate
12489d9e37 Merge remote-tracking branch 'origin/master' 2016-04-05 09:26:09 +02:00
Murodjon Abduvohidov
66e7a13a04 Translated using Weblate (Uzbek) 
Currently translated at 33.1% (1062 of 3208 strings)

[CI skip]
 2016-04-05 09:26:09 +02:00
Anders Jonsson
1ca355900e Translated using Weblate (Swedish) 
Currently translated at 97.6% (3133 of 3208 strings)

[CI skip]
 2016-04-05 09:26:08 +02:00
Weblate
d2a669b832 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-04-05 09:26:03 +02:00
Murodjon Abduvohidov
a83a1092df Translated using Weblate (Uzbek) 
Currently translated at 33.2% (1067 of 3211 strings)

[CI skip]
 2016-04-05 09:26:03 +02:00
Anders Jonsson
810a5cb9fc Translated using Weblate (Swedish) 
Currently translated at 97.8% (3142 of 3211 strings)

[CI skip]
 2016-04-05 09:26:03 +02:00
Michal Čihař
440e2f215b Merge branch 'QA_4_6' 2016-04-05 09:25:48 +02:00
Michal Čihař
a65a4213d7 Load gettext before autoloader 
This fixes possible PHP error in SQL parser as it tries to define __()
if it's not existing. Later loading of gettext just breaks this.

Fixes #12154

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-05 09:24:15 +02:00
Weblate
36f744e71f Merge remote-tracking branch 'origin/master' 2016-03-31 12:41:02 +02:00
Krisztián Patai
6d8102098d Translated using Weblate (Hungarian) 
Currently translated at 94.9% (3047 of 3208 strings)

[CI skip]
 2016-03-31 12:40:59 +02:00
Madhura Jayaratne
476d9a5746 Merge branch 'QA_4_6' 2016-03-31 21:39:21 +11:00
Weblate
33e32daf17 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-03-31 12:37:10 +02:00
Eshin Kunishima
863d2fb4c3 Translated using Weblate (Japanese) 
Currently translated at 67.6% (2173 of 3211 strings)

[CI skip]
 2016-03-31 12:37:09 +02:00
Krisztián Patai
e0a340f107 Translated using Weblate (Hungarian) 
Currently translated at 95.1% (3056 of 3212 strings)

[CI skip]
 2016-03-31 12:37:09 +02:00
Madhura Jayaratne
6d7acf969a Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 
Conflicts:
	ChangeLog
 2016-03-31 21:36:58 +11:00
Madhura Jayaratne
413f66f4c2 Fix #12125 Cannot highlight a column if I scroll down from the top of the table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-31 21:34:43 +11:00
Weblate
49b3dbb837 Merge remote-tracking branch 'origin/master' 2016-03-30 15:40:06 +02:00
Ricardo Crivelli
43e031aab6 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.1% (2955 of 3208 strings)

[CI skip]
 2016-03-30 15:40:05 +02:00