Commit Graph

186 Commits

Author SHA1 Message Date
Atul Pratap Singh
916143e27f Fix multiple LEFT JOIN generation problem 2012-07-22 18:32:43 +05:30
Atul Pratap Singh
ec6ac79775 Some more variable name improvements 2012-07-17 06:54:14 +05:30
Atul Pratap Singh
1623e5581d Remove some global variables 2012-07-15 16:12:46 +05:30
Chanaka Indrajith
39d37fafcc Resolved conflicts 2012-06-27 21:53:59 +05:30
Madhura Jayaratne
ec046f7d11 Use camel case for function names (PMA_query_as_controluser => PMA_queryAsControlUser) 2012-06-23 23:06:29 +05:30
Chanaka Indrajith
766466135e Implement class behavior of common.lib.php file 2012-06-22 23:38:33 +05:30
Rouslan Placella
c2ae2ae265 Integrated chk_rel.php with PMA_Response class 2012-06-11 14:06:03 +01:00
Michal Čihař
4c099ccc71 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-06-05 09:19:15 +02:00
Michal Čihař
3a6a938853 Fix variable name 2012-06-05 09:18:59 +02:00
Rouslan Placella
9d38c349bf Fixed regression from commit e544705e3c 2012-06-04 16:03:59 +01:00
Michal Čihař
1a171a9e2f Fix function name 2012-06-04 13:31:08 +02:00
Michal Čihař
a9d7091b84 Wrap some long lines 2012-06-04 13:24:01 +02:00
Michal Čihař
e544705e3c Wrap some long lines 2012-06-04 12:12:49 +02:00
Michal Čihař
6313931432 Add missing comment 2012-06-04 12:08:58 +02:00
Michal Čihař
705c01b5c9 Better name for function 2012-06-04 12:08:14 +02:00
Michal Čihař
fae33dee87 Add documentation 2012-06-04 12:07:21 +02:00
Michal Čihař
9e4a145297 Correct wrapping 2012-06-04 12:07:04 +02:00
Michal Čihař
9e09c575d7 Missing doc 2012-06-04 12:06:37 +02:00
Michal Čihař
7faef41a23 This code is broken anyway (see comment above) 2012-06-04 12:03:46 +02:00
Michal Čihař
5162efa87c Single place to handle table renaming for configuration storage 2012-06-04 12:02:55 +02:00
Michal Čihař
397b6fd00e Cleanup spacing after @return 2012-04-27 11:33:26 +02:00
Michal Čihař
fbfe2dc3d4 Another syntax error I introduced 2012-04-27 09:53:38 +02:00
Michal Čihař
dbf1f40808 Another missing comma 2012-04-27 09:52:39 +02:00
Michal Čihař
6ad180e22e Oops, missing comas 2012-04-27 09:31:42 +02:00
Michal Čihař
16d040b4a5 Wrap some function calls 2012-04-27 09:15:31 +02:00
Marc Delisle
d3266a202d verbose_check is no longer needed 2012-04-14 10:06:58 -04:00
Madhura Jayaratne
b531455738 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Conflicts:
	libraries/mult_submits.inc.php
2012-03-21 05:59:46 +05:30
Madhura Jayaratne
ac83360796 Coding style improvements 2012-03-21 05:45:58 +05:30
Marc Delisle
a196cbd85f Merge pull request #7 from mynetx/master
Various
2012-03-18 12:09:23 -07:00
Jo Michael
c36a9113e0 Replaced td[align] with td[class] due to HTML5 2012-03-18 19:53:43 +01:00
Madhura Jayaratne
d5d3d2bba4 Use 'void' if nothing is returned 2012-03-18 10:04:39 +05:30
Michal Čihař
3bf006c5eb Better context 2012-03-09 16:09:02 +01:00
Michal Čihař
fde7faa749 Chinese needs different word here than in other places 2012-03-09 16:03:10 +01:00
Michal Čihař
a32fac4c4b Update references to SQL files 2012-02-14 16:01:32 +01:00
Michal Čihař
e56949f160 Use package name PhpMyAdmin
Needed to match phpdoc rules as package name must begin with upper case.
2011-10-25 10:13:17 +02:00
Madhura Jayaratne
0ad1a0f831 Fix doc blocks and multiline if statements 2011-09-27 21:49:41 +05:30
Madhura Jayaratne
9bcb83af03 File is being conditionally included; use "include" instead 2011-09-23 10:56:30 +05:30
Piotr Przybylski
970262c435 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-15 12:03:04 +02:00
Michal Čihař
21e2913add Remove not needed param from PMA_REL_create_page 2011-08-15 11:37:23 +02:00
Michal Čihař
b0a108473e Remove not needed param from PMA_REL_create_page 2011-08-15 11:36:13 +02:00
Piotr Przybylski
7f1fa1bab0 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	js/server_status.js
	libraries/database_interface.lib.php
	libraries/mysql_charsets.lib.php
2011-08-05 17:17:47 +02:00
Michal Čihař
1ec0b69e6b Coding style, function definitions 2011-08-05 14:49:23 +02:00
Piotr Przybylski
ca8a30f7f8 Fix usage of PMA_DBI_get_columns 2011-08-05 01:24:02 +02:00
Piotr Przybylski
11f2c43f11 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-03 23:58:48 +02:00
Madhura Jayaratne
c1f586b9fd Bug #3383904 - Column comments are not displayed 2011-08-03 20:48:28 +05:30
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
Michal Čihař
b40fdde6e8 Revert "Avoid double underscore in function name"
This reverts commit c29c0e0eb5.

Oops, this is actually needed.
2011-07-21 11:08:44 +02:00
Michal Čihař
c29c0e0eb5 Avoid double underscore in function name 2011-07-21 11:04:37 +02:00