Commit Graph

152 Commits

Author SHA1 Message Date
Atul Pratap Singh
78cf1c4e22 Left while fixing 4006 2013-07-29 19:37:43 +05:30
Michal Čihař
80e6ecc1c2 Merge commit '5d590ef3d67b4f87b58dbda50e86519bf9b64d34'
Conflicts:
	import.php
2013-07-29 15:00:07 +02:00
Atul Pratap Singh
5d590ef3d6 Fix bug#4006 2013-07-29 17:36:45 +05:30
Spun Nakandala
3dd358746d removed include sql.php from import.php 2013-07-27 23:18:06 +05:30
Spun Nakandala
c44eb79b49 no use of the code segment 2013-07-27 23:18:04 +05:30
Marc Delisle
fd111566c9 Fix merge conflict 2013-06-30 06:41:44 -04:00
Marc Delisle
0124642684 [security] Global variables scope injection vulnerability (see PMASA-2013-7) 2013-06-28 13:09:13 -04:00
Marc Delisle
c4883127c7 This file should not end in .lib.php 2013-06-16 08:08:07 -04:00
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Marc Delisle
d44367e4db Fix merge conflicts 2013-05-15 13:07:22 -04:00
J.M
529903e0dd Fix bug #3907 undefined variables, function parameter problems
Thanks Rasmus Lerdorf for analyzing!
2013-05-13 11:27:56 +02:00
Kasun Chathuranga
42256b2d0c PMA_DBI_select_db --> PMA_DBI_selectDb 2013-05-04 08:26:27 +05:30
Marc Delisle
6e88efd282 Fix merge conflicts 2013-04-27 16:43:04 -04:00
J.M
8bf86d9a7a Fix bug #3891 Server upload folder import file name missing in success message 2013-04-27 21:16:31 +02:00
J.M
1f7336f540 Fix bug #3890 [import] Web server upload directory import fails 2013-04-26 12:13:07 +02:00
Madhura Jayaratne
324e4dbe73 Merge branch 'QA_4_0'
Conflicts:
	ChangeLog
2013-04-25 20:54:51 +05:30
Kasun Chathuranga
06655bf45d Fix bug #3879 Import broken for CSV using LOAD DATA 2013-04-17 23:25:16 +05:30
Madhura Jayaratne
466a7645c7 PHP keywords must be lowercase 2013-04-12 21:45:02 +05:30
Atul Pratap Singh
f3aa2a3d33 Fix bug 3842: create, alter, drop queries were not shown after execution 2013-03-21 11:13:43 +05:30
ayushchd
bd4e284e4b Applied PMA_Util::unQuote to table name extracted from the RENAME command 2013-02-26 18:32:27 +05:30
ayushchd
7112e7f416 Cosmetic changes 2013-02-26 03:26:21 +05:30
ayushchd
14af610aa8 Contest-2 Variable Name Fix
Changed the variable name from ajax_reload_nav to ajax_reload
2013-02-25 17:06:50 +05:30
ayushchd
69b73a44b0 Bug fix #3818 After "Rename table ... to ..." left menu doesn't reflect changes
The left navigationa and the other places where the old table name was
showing up, now updates if the table is renamed.
2013-02-25 14:28:27 +05:30
Michal Čihař
a6e5286467 Fix links to FAQ 2012-11-12 14:15:45 +01:00
Michal Čihař
61a601fc73 Implement linking to new documentation 2012-11-12 09:48:05 +01:00
Chanaka Indrajith
e6894be57f Renamed ->method() with PMA_Util::method() 2012-09-16 14:35:45 +05:30
Chanaka Indrajith
0829709064 Remove variable 2012-09-16 14:31:22 +05:30
Madhura Jayaratne
2095bc3211 Wrap some long lines 2012-09-05 22:13:55 +05:30
Michal Čihař
371d420c21 Simplify linking to documentation
Now documentation can be simply linked using [doc@anchor]..[/doc]
2012-09-05 15:19:13 +02:00
Dieter Adriaenssens
9727ee246c improve message, wrap long line 2012-09-03 19:56:01 +02:00
Madhura Jayaratne
7e169fcaef Coding style improvements 2012-08-31 01:27:17 +05:30
Dieter Adriaenssens
623de27ef2 use include(_once) in case of conditional including 2012-08-30 17:35:56 +02:00
Chanaka Indrajith
4465c287c1 Fixed an issue related to multiquery statements and routines modifications 2012-07-26 23:06:29 +05:30
Chanaka Indrajith
d5acfed0e8 Multiple results support for SQL executions 2012-07-20 23:13:04 +05:30
Chanaka Indrajith
106265a7f8 Resolve conflicts 2012-06-30 11:30:39 +05:30
Chanaka Indrajith
766466135e Implement class behavior of common.lib.php file 2012-06-22 23:38:33 +05:30
Alex Marin
0899d6722e oop: merge master 2012-06-17 11:40:11 +03:00
Rouslan Placella
a16e723048 Dropped PMA_ajaxResponse() 2012-06-11 17:58:35 +01:00
Rouslan Placella
ae6e50a8a8 Drop display() from Header and Footer classes. The Response class will do all the rendering. 2012-06-11 14:06:04 +01:00
Rouslan Placella
eb98110541 Dropped footer.inc.php 2012-06-11 14:06:04 +01:00
Rouslan Placella
a054562100 PMA_Footer and PMA_Header no longer need to be singletons 2012-06-11 14:06:03 +01:00
Rouslan Placella
4a740376c8 Dropped header.inc.php in favor of the PMA_Header class 2012-06-11 14:06:02 +01:00
Alex Marin
0ff6393062 plugins and OOP: merge master, fix conflicts 2012-06-04 12:14:32 +03:00
Madhura Jayaratne
6f9253b59e Various coding style improvements 2012-06-03 20:40:47 +05:30
Alex Marin
a87f283a23 plugins and OOP: create general class structure and ExportXML 2012-05-28 00:21:14 +03:00
Michal Čihař
a5839a3813 Fix spacing before tags 2012-04-27 11:25:37 +02:00
Alex Marin
4de7d3c83d bookmark sql query after checking errors 2012-04-20 17:21:06 +03:00
Alex Marin
621280ec78 remove spaces around the not operator 2012-04-20 16:47:24 +03:00
Jo Michael
b2fd866d87 Leading ./ paths for includes can be omitted, part 2 2012-03-16 23:11:57 +01:00
Jo Michael
0326405d00 Don't rely on grab_globals for import.php 2012-03-16 20:14:27 +01:00