Commit Graph

9975 Commits

Author SHA1 Message Date
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
Marc Delisle
0c6e134d36 Fix merge conflicts 2013-08-07 08:31:38 -04: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ř
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
Michal Čihař
e9da696911 Various coding style fixes 2013-08-07 11:59:01 +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
Michal Čihař
ffae07abda Wrap long lines 2013-08-07 10:54:51 +02:00
Michal Čihař
8e71b13ced CS compliant transformation helper functions 2013-08-07 10:53:09 +02:00
Michal Čihař
f301c26551 Various coding style fixes 2013-08-07 10:51:50 +02:00
Michal Čihař
f3d94d93ff Wrap long lines 2013-08-07 10:44:01 +02:00
Michal Čihař
ddf42335d9 Add function docs 2013-08-07 10:31:16 +02:00
Michal Čihař
b4dc0213e6 Add infrastructure for doc links in SQL highlighter 2013-08-07 09:28:19 +02:00
Michal Čihař
160457e25f Fix session path for javascript loader 2013-08-07 09:20:44 +02:00
Michal Čihař
969c3cca56 Remove unused params doc 2013-08-07 08:50:22 +02:00
Michal Čihař
d1bb142e87 Remove unused param from PMA_Util::showMySQLDocu 2013-08-07 08:48:50 +02:00
Michal Čihař
d7c3b58337 Dropped MySQL manual type configuration
Nothing but default settings is really working now:

- most formats are no longer available on MySQL formats
- for downloadable doc our links are in most cases broken and nobody
  noticed this, so I assume nobody is using this
- anyway most current installations don't have troubles with internet
  access what was main motivation for this configuration directive
2013-08-07 08:32:01 +02:00
Michal Čihař
eac01ea7f7 Split URL generating from returning URL 2013-08-07 08:26:59 +02:00
Michal Čihař
91bd7e4f0e Remove no longer needed doc name mappings 2013-08-07 08:11:32 +02:00
Marc Delisle
60c67be9b8 Convert end of lines 2013-08-06 13:01:37 -04:00
Michal Čihař
6bfecf8e94 Construct filename once 2013-08-06 15:27:25 +02:00
Michal Čihař
ff046ce8a6 Convert end of lines 2013-08-06 15:25:01 +02:00
Michal Čihař
add10c5cd4 Wrap some long lines 2013-08-06 15:22:51 +02:00
Michal Čihař
4085726b5e Better formatting of if statements 2013-08-06 15:18:53 +02:00
Michal Čihař
3b7a3af222 Various coding style improvements 2013-08-06 15:17:20 +02:00
Michal Čihař
6d127c62da Use lowercase constant 2013-08-06 15:15:10 +02:00
Michal Čihař
a3ce1cc6a9 Linebreaks cleanup 2013-08-06 15:14:44 +02:00
Michal Čihař
5ed8d97640 Wrap long lines 2013-08-06 15:09:06 +02:00
Michal Čihař
ccc186e876 Load gettext without setup for errors
This pulls in definition of other functions than __ so that any messages
would work.
2013-08-06 15:07:35 +02:00
Michal Čihař
e8e46416fc Wrap long lines 2013-08-06 15:06:04 +02:00
Michal Čihař
46fe6a0f3d Wrap long lines 2013-08-06 15:04:23 +02:00
Michal Čihař
15c3fee596 Document file 2013-08-06 15:03:33 +02:00
Michal Čihař
ee4a97ede0 Wrap long condition 2013-08-06 15:02:08 +02:00
Michal Čihař
dba4f07914 Add missing docs 2013-08-06 15:01:16 +02:00
Michal Čihař
53230cba43 Fix variable name 2013-08-06 13:51:30 +02:00
Michal Čihař
0e96f7a8af Always initialize variable 2013-08-06 13:49:20 +02:00