Commit Graph

381 Commits

Author SHA1 Message Date
Piotr Przybylski
ce7e6feaf5 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/export/htmlword.php
	libraries/export/latex.php
	libraries/export/odt.php
	libraries/export/sql.php
	libraries/export/texytext.php
	libraries/export/xml.php
2011-08-03 00:25:43 +02:00
Michal Čihař
3769b849aa Forgot to reindent some files 2011-08-02 15:53:19 +02:00
Michal Čihař
7e7be00f84 Forgot to reindent this one 2011-08-02 15:50:44 +02:00
Michal Čihař
8cb1f3a1cc Fix indentation 2011-08-02 15:25:27 +02:00
Piotr Przybylski
3586bb992f Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	db_structure.php
	libraries/database_interface.lib.php
	libraries/server_synchronize.lib.php
	server_status.php
	sql.php
2011-07-22 11:07:04 +02:00
Michal Čihař
9405dbb82a Fix spacing after @param 2011-07-22 09:21:55 +02:00
Michal Čihař
25bda8e991 Fix spacing on opening code block 2011-07-22 09:18:02 +02:00
Piotr Przybylski
a28beb9c1f Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/server_synchronize.lib.php
	server_status.php
2011-07-21 15:25:52 +02:00
Michal Čihař
dd641ef164 Wrap some long lines 2011-07-21 14:49:25 +02:00
Michal Čihař
7986ea8f35 Free result once we do not need it 2011-07-21 14:36:01 +02:00
Michal Čihař
dafefcd275 More replacement of double quotes 2011-07-21 14:35:43 +02:00
Michal Čihař
008b96aaec Coding style
Wrap ling lines, add missing {} around for and if.
2011-07-21 14:31:50 +02:00
Michal Čihař
c03c7bbc69 Better formatting for code 2011-07-21 14:25:31 +02:00
Michal Čihař
7f629c66ff Remove method used only in single place as a function 2011-07-21 14:22:01 +02:00
Michal Čihař
b349356a83 Avoid storing table data when we don't need it 2011-07-21 14:20:11 +02:00
Michal Čihař
79af2a9374 Minimize need for escaping by using single quotes 2011-07-21 14:19:07 +02:00
Michal Čihař
73bb9302b6 Minimize need for escaping by using single quotes 2011-07-21 14:17:51 +02:00
Michal Čihař
beb73226c4 Minor fixes in coding style 2011-07-21 14:15:35 +02:00
Michal Čihař
48e9af42e0 Add missing space after foreach calls 2011-07-21 11:21:26 +02:00
Piotr Przybylski
6dbcab261e Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	server_status.php
2011-07-20 18:23:21 +02:00
Michal Čihař
e2dff46f79 There is no result here 2011-07-19 13:50:57 +02:00
Piotr Przybylski
08d4e5a5b8 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/export/htmlword.php
2011-07-18 22:20:33 +02:00
Michal Čihař
1b5691656e Use PMA_DBI_get_columns instead of own query 2011-07-18 10:27:50 +02:00
Rouslan Placella
7a31e75eb6 Merge branch 'QA_3_4'
Conflicts:
	libraries/export/codegen.php
	libraries/export/xml.php
2011-07-15 16:10:24 +01:00
Rouslan Placella
40d7c3b8ba tabs -> spaces 2011-07-15 16:02:37 +01:00
Piotr Przybylski
2cc22c8aba Fix CodeGen export 2011-07-14 23:48:17 +02:00
Piotr Przybylski
70083ad583 Fix XML export so it actually can export table structure
More escaping fixes
2011-07-14 23:43:56 +02:00
Piotr Przybylski
65d962d397 Better escaping in XML export
Note: it's still incorrect
2011-07-14 23:40:58 +02:00
Piotr Przybylski
6d0f28b425 Improve readability of XML export code 2011-07-14 23:38:09 +02:00
Piotr Przybylski
a0a4628b11 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/export/latex.php
	libraries/export/odt.php
	libraries/export/texytext.php
	libraries/export/xml.php
2011-07-14 22:38:20 +02:00
Piotr Przybylski
291e3b6a9f Use PMA_DBI_get_columns in texytext export 2011-07-14 22:32:04 +02:00
Piotr Przybylski
bdbb888713 Use PMA_DBI_get_columns in odt export 2011-07-14 22:27:56 +02:00
Piotr Przybylski
8ff9a1bb78 Whitespace 2011-07-14 21:31:46 +02:00
Piotr Przybylski
ff7116bf7e Fix CodeGen export 2011-07-14 21:31:45 +02:00
Piotr Przybylski
4ec9c3b09c Use PMA_DBI_get_columns in mediawiki export 2011-07-14 21:31:45 +02:00
Piotr Przybylski
f1bcbb500a Use PMA_DBI_get_columns in latex export 2011-07-14 21:31:45 +02:00
Piotr Przybylski
ad87dcf884 Removed useless code 2011-07-14 01:48:13 +02:00
Piotr Przybylski
bce8eaf40a JSON export plugin: fix syntax for empty table, better data escaping 2011-07-14 01:44:41 +02:00
Piotr Przybylski
059ddeb797 Better db and table name escaping in codegen and htmlword export plugins 2011-07-14 01:43:30 +02:00
Piotr Przybylski
f7591dd563 Fix SQL export 2011-07-14 00:57:19 +02:00
Piotr Przybylski
151799f17f Properly escape database name 2011-07-14 00:41:11 +02:00
Piotr Przybylski
59e71a06c0 Quick fixes for XML export 2011-07-14 00:40:15 +02:00
Piotr Przybylski
fb01897f61 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-14 00:30:39 +02:00
Piotr Przybylski
d84d51c775 Fix XML export so it actually can export table structure
More escaping fixes
2011-07-14 00:05:58 +02:00
Piotr Przybylski
667cf67954 Better escaping in XML export
Note: it's still incorrect
2011-07-13 23:50:22 +02:00
Piotr Przybylski
09e74a9415 Improve readability of XML export code 2011-07-13 23:40:58 +02:00
Piotr Przybylski
dd6f936731 Make PMA_DBI_get_triggers aware that Drizzle doesn't have triggers 2011-07-13 20:57:05 +02:00
Piotr Przybylski
480fe9f78c Merge remote-tracking branch 'origin/master' into drizzle 2011-07-13 17:37:50 +02:00
Michal Čihař
ae780330e8 Add missing semicolon 2011-07-13 17:05:34 +02:00
Piotr Przybylski
7801d55018 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-13 14:05:24 +02:00