Commit Graph

104 Commits

Author SHA1 Message Date
Chanaka Indrajith
766466135e Implement class behavior of common.lib.php file 2012-06-22 23:38:33 +05:30
Michal Čihař
397b6fd00e Cleanup spacing after @return 2012-04-27 11:33:26 +02: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
9f179dddc2 Coding style improvements - mostly doc comments 2012-03-21 05:45:12 +05:30
Jo Michael
653f086815 Replaced xml:lang attributes by lang for HTML5 2012-03-18 14:46:59 +01:00
Madhura Jayaratne
35b18e57a2 Coding style improvements - Multiline assignments 2011-12-07 23:28:50 +05:30
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
Piotr Przybylski
8cd8760256 Create PMA_is_system_schema() function which checks whether current database server treats it as a system schema 2011-08-23 22:48:14 +02:00
Piotr Przybylski
a7c0c55c7f Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	js/server_status.js
	libraries/common.lib.php
	tbl_printview.php
	tbl_select.php
	tbl_structure.php
2011-08-12 22:02:40 +02:00
Michal Čihař
747ab57391 Adjust switch blocks to PEAR coding standards 2011-08-08 17:35:03 +02:00
Michal Čihař
8f618e6f01 Convert more occurences of inline autosubmit code to external js 2011-08-08 13:29:20 +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
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
Piotr Przybylski
3bde595666 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-27 23:55:32 +02:00
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Piotr Przybylski
a56d77fb67 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-06 12:12:42 +02:00
Michal Čihař
3cf4830bbb Replace TRUE/FALSE with true/false.
At least this seems to be the coding standard, so make all files
compliant.
2011-06-06 11:55:09 +02:00
Piotr Przybylski
8b47a1dbd4 Remove $mysql_charsets_count and $mysql_collations_count 2011-06-06 00:31:52 +02:00
Piotr Przybylski
d3ea25c159 Make PMA_getDbCollation work with Drizzle 2011-05-25 18:25:45 +02:00
Piotr Przybylski
2b202c04ce Drizzle has CHARACTER SET 2011-05-25 18:17:41 +02:00
Piotr Przybylski
be748a7d84 Case insensitive comparisons to check for I_S, tread D_D as I_S 2011-05-17 00:00:21 +02:00
Piotr Przybylski
7bf17c1843 Fix for Drizzle collations 2011-05-09 19:46:32 +02:00
Marc Delisle
e6211f0c2f Other replacements for easier reading 2011-05-09 12:57:28 -04:00
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Piotr Przybylski
d421c85a5c Make Charsets tab read charset and collation info from information_schema (MySQL) / data_dictionary (Drizzle) instead of SHOW statements 2011-04-06 15:40:58 +02:00
Piotr Przybylski
4c957837eb Introduce PMA_DRIZZLE constant 2011-04-06 15:40:58 +02:00
Piotr Przybylski
b02955420c make Drizzle version checks consistent 2011-02-17 02:48:59 +01:00
Michal Čihař
694d0d5563 Provide description for utf8 in Drizzle. 2010-10-21 10:12:10 +02:00
Michal Čihař
88e6ca4609 Avoid charset queries on Drizzle. 2010-10-21 10:04:49 +02:00
Marc Delisle
502a6f4046 unused variable 2010-09-04 07:08:26 -04:00
Michal Čihař
d17fba309c Fix permissions.
Most files were made executable somewhere in ninadsp tree, reverting
this.
2010-08-30 09:53:37 +02:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Michal Čihař
15dfc4879e Drop collation description cache.
It really does not improve performance much and it just consumes memory.
Anyway on most pages this function is called just once for each
collation, so all it does is filling up the cache but never using it.
2010-07-26 13:29:29 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
ninadsp
ac7cab7160 Revert "Revert "Merge remote branch 'origin/master'""
This reverts commit 4214d83e12.
2010-06-26 15:45:27 +05:30
ninadsp
4214d83e12 Revert "Merge remote branch 'origin/master'"
This reverts commit c850b8be8b, reversing
changes made to dcdde2f99f.
2010-06-26 15:43:52 +05:30
ninadsp
c850b8be8b Merge remote branch 'origin/master'
Conflicts:
	po/tr.po
2010-06-26 15:38:12 +05:30
Marc Delisle
1be2d538df fix merge conflicts 2010-06-24 10:09:19 -04:00
Stéphane Pontier
4c0e653de0 patch #2932113 Slow export when having lots of databases 2010-06-24 10:01:21 -04:00
ninadsp
bed1948d04 testing git setup - no major change made in code yet
only added a few comments
2010-05-23 01:22:01 +05:30
Marc Delisle
2b4a5e68ee gettext conversion 2010-05-09 08:03:11 -04:00
Marc Delisle
2182098af6 strings to gettext, second batch 2010-05-04 20:07:19 -04:00
Marc Delisle
526dce65cb 3.3 2009-12-31 13:11:19 +00:00
Marc Delisle
f3833884e4 3.3 2009-12-31 13:09:18 +00:00
Michal Čihař
56941e509c Adding @package, second part. 2008-11-24 11:05:40 +00:00
Marc Delisle
afbb2a9dc2 protection against XSS when register_globals is on and .htaccess has no effect 2008-06-21 15:01:27 +00:00
Sebastian Mendel
801249f3a5 use function for caching 2008-01-22 07:29:08 +00:00