gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,968 Commits 12 Branches 481 Tags 2.4 GiB
171a33aef6
Commit Graph

85968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
adamgsoc2013
171a33aef6 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into ut_plu_dbi 2013-08-08 17:50:36 +08:00
Michal Čihař
1dcd173555 No newlines inside query 2013-08-07 19:54:49 +02:00
Michal Čihař
40a0aec442 Fix typo 2013-08-07 19:53:52 +02:00
Michal Čihař
482b6a23b7 Another SQL fixup 2013-08-07 19:51:35 +02:00
Michal Čihař
2764e7b940 Fix expected SQL query 2013-08-07 19:44:41 +02:00
Michal Čihař
036c128c56 Merge pull request #573 from ayushchd/codestyle_fixes 
Testsuite code-compliance fixes
 2013-08-07 10:41:08 -07:00
Michal Čihař
309669820e Missing ; 2013-08-07 19:40:12 +02:00
ayushchd
b9a5bffaba Testsuite code-compliance fixes 2013-08-07 22:28:46 +05:30
Michal Čihař
b2e1f81c0c Use PMA_URL_getCommon for generating all params 2013-08-07 17:00:52 +02:00
Michal Čihař
ae14690b9c Wrap long line 2013-08-07 16:46:29 +02:00
Michal Čihař
686025b018 Missing space 2013-08-07 16:46:11 +02:00
Michal Čihař
54d0714c55 Prevent manual tweaking of url parameters 
PMA_URL_getCommon provides better inteface to constuct them
 2013-08-07 16:37:17 +02:00
Michal Čihař
657c3dfdc3 Various coding style fixes 2013-08-07 16:20:15 +02:00
Michal Čihař
a14a83b4a8 Documentation and coding style improvements 2013-08-07 16:17:02 +02:00
Michal Čihař
7e142381c9 Correctly generate link for exporting user 
With PMA_URL_getCommon we get correct separator and escaping
for free.
 2013-08-07 16:12:24 +02:00
Michal Čihař
311fc81bce Correctly generate link for revoking user 
With PMA_URL_getCommon we get correct separator and escaping
for free.
 2013-08-07 16:07:24 +02:00
Michal Čihař
950af59138 Correctly use PMA_URL_getCommon instead of manually adding some parameters 2013-08-07 16:01:10 +02:00
Michal Čihař
056ed1929e Correctly generate link for editing user 
With PMA_URL_getCommon we get correct separator and escaping for free.
 2013-08-07 15:57:46 +02:00
Michal Čihař
47b6481845 Remove always set $conditional_class variable 2013-08-07 15:48:19 +02:00
Michal Čihař
e5905bb884 Better error message 2013-08-07 15:25:44 +02:00
Michal Čihař
c2c6ace1ae Do not check against hardcoded value 2013-08-07 15:23:48 +02:00
Michal Čihař
bb1df87584 Gettext is already loaded at this point 2013-08-07 15:12:57 +02:00
Michal Čihař
a89bb5dd92 Move assignment out of if 2013-08-07 15:12:09 +02:00
Michal Čihař
aa92d22931 Allow config loader to recover from fatal errors 
The config loader now registers shutdown function which can print out
error message in case of loading config file fails.

Fixes bug #3980
 2013-08-07 15:07:29 +02:00
Michal Čihař
7153a45546 Correctly merge server variables fix to master 2013-08-07 14:43:01 +02:00
Michal Čihař
04ed28ccd5 Merge remote-tracking branch 'origin/QA_4_0' 
Conflicts:
	server_variables.php
 2013-08-07 14:41:59 +02:00
Michal Čihař
e4ee7fc51f Merge commit '2684d0a0f8631f920ad2c29a2a497eb6afed5a22' 2013-08-07 14:41:15 +02:00
Michal Čihař
01ebe9c030 Do not double HTML encode URL 
PMA_generate_common_url already does HTML encoding, so there is no need
to do that again (bug #4026).
 2013-08-07 14:39:39 +02:00
Marc Delisle
0c6e134d36 Fix merge conflicts 2013-08-07 08:31:38 -04:00
Marc Delisle
e5f46ca907 Merge commit '67dc378' 2013-08-07 08:28:40 -04:00
Weblate
2684d0a0f8 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-08-07 14:28:16 +02:00
성현 양
1b70a0086b Translated using Weblate (Korean) 
Currently translated at 73.1% (1908 of 2609)
 2013-08-07 14:28:13 +02:00
Marc Delisle
c2b2c7b6e9 Bug #4048 Cannot select foreign value in Search 2013-08-07 08:27:34 -04:00
Michal Čihař
bb03e612f0 Add missing space 2013-08-07 13:54:17 +02:00
Michal Čihař
6ac552ac7c No more inline html 2013-08-07 13:48:20 +02:00
Michal Čihař
cb5e1cb966 Various coding style fixes 2013-08-07 13:21:59 +02:00
Michal Čihař
fb8d73cd2a Add comments 2013-08-07 13:17:26 +02:00
Marc Delisle
549b9c9583 Directly use the post parameter 2013-08-07 06:03:53 -04:00
Michal Čihař
e9da696911 Various coding style fixes 2013-08-07 11:59:01 +02:00
Michal Čihař
c419f5be59 Add some missing includes 2013-08-07 11:40:28 +02:00
Michal Čihař
07c1e0a14a Revert "Use parser flags instead of regexp matching" 
This reverts commit 622523de41.

We don't have flags always available...
 2013-08-07 11:37:52 +02:00
Michal Čihař
48df0d6d23 Another syntax error 2013-08-07 11:30:20 +02:00
Michal Čihař
7a70c0581a Fix syntax error 2013-08-07 11:26:24 +02:00
Michal Čihař
865de7028a Use foreach instead of for 2013-08-07 11:25:18 +02:00
Michal Čihař
2c17db1063 Calculate file path just once 2013-08-07 11:22:39 +02:00
Michal Čihař
e725e3b55e Do not assign inside if statement 2013-08-07 11:21:14 +02:00
Michal Čihař
4734ffae58 Wrap line 2013-08-07 11:20:48 +02:00
Michal Čihař
622523de41 Use parser flags instead of regexp matching 2013-08-07 11:20:01 +02:00
Michal Čihař
1a9edda119 Various coding style fixes 2013-08-07 11:06:41 +02:00
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00