Commit Graph

5224 Commits

Author SHA1 Message Date
Madhura Jayaratne
4ee9d48346 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-07-14 19:49:59 +05:30
Marc Delisle
b44ece2949 Create a new is redundant 2011-07-14 09:20:34 -04:00
Rouslan Placella
f989d6f0cf Fixed handling of length/values for the return variable of functions 2011-07-14 13:06:31 +01:00
Rouslan Placella
9ca378d794 Merge branch 'rte' 2011-07-14 12:57:31 +01:00
Rouslan Placella
0e622faed6 Removed redundant code from rte_routines.lib.php 2011-07-14 12:57:09 +01:00
Madhura Jayaratne
ac4f0a10b0 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-07-14 10:01:41 +05:30
Madhura Jayaratne
66f73b4114 Better error handling. 2011-07-14 09:59:35 +05:30
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
590059cc30 Fix db/table name escaping in UI preferences 2011-07-14 01:30:25 +02:00
Piotr Przybylski
151799f17f Properly escape database name 2011-07-14 00:41:11 +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
Madhura Jayaratne
e0e0dea09b 1) Better error handling. 2)Typo 2011-07-14 00:09:25 +05:30
Madhura Jayaratne
1d9ef02608 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-07-13 23:55:14 +05:30
Madhura Jayaratne
a1e6b187c6 Correctly display error message for zero data. 2011-07-13 23:51:25 +05:30
Rouslan Placella
d3fa11c19b Move declarations of globals into functions, so that unit tests are possible 2011-07-13 18:42:10 +01:00
Piotr Przybylski
f57faf6b58 Removed unused code 2011-07-13 17:29:07 +02:00
Piotr Przybylski
df4c23f0c9 Comments and formatting in common.lib.php 2011-07-13 17:29:06 +02:00
Piotr Przybylski
b5d450ff31 PMA_MYSQL_INT_VERSION is at least 50015 2011-07-13 17:29:06 +02:00
Michal Čihař
ae780330e8 Add missing semicolon 2011-07-13 17:05:34 +02:00
Marc Delisle
b2d8e0b60f Clarify directive name: ShowDisplayDir -> ShowDisplayDirection 2011-07-13 09:19:38 -04:00
Piotr Przybylski
e7a4453406 More code formatting changes 2011-07-13 14:02:43 +02:00
Rouslan Placella
02b32a14b5 PHP's in_array does not work on multidimential arrays 2011-07-13 12:29:02 +01:00
Rouslan Placella
0ebd961db7 Merge branch 'rte' 2011-07-13 11:15:25 +01:00
Madhura Jayaratne
f76785603f Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-07-13 00:20:41 +05:30
Madhura Jayaratne
2bf70868bb Avoid undefined variables 2011-07-13 00:19:11 +05:30
Madhura Jayaratne
242534a78a Avoid divide by zero error 2011-07-13 00:17:09 +05:30
Piotr Przybylski
2c0d2aca16 Use PMA_MYSQL_STR_VERSION instead of reconstructing it from PMA_MYSQL_INT_VERSION 2011-07-12 18:16:01 +02:00
Rouslan Placella
8aad65b494 Moved some Routine functions around to match the order of Event and Trigger functions. 2011-07-12 17:14:32 +01:00
Piotr Przybylski
ced22c9c22 Remove unused function from most export plugins: PMA_exportComment
It's used only locally in SQL export
2011-07-12 17:50:46 +02:00
Piotr Przybylski
f14a4e567f Unify comments for export plugins 2011-07-12 17:50:46 +02:00
Rouslan Placella
ff7468b2cf Merge branch 'master' into rte 2011-07-12 14:54:42 +01:00
Rouslan Placella
fed169554a Swapped some inline styles for classes. 2011-07-12 14:52:36 +01:00
Rouslan Placella
6f0f522fcd Do not send 'name' and 'row' data in the AJAX request, if it will not be used because the trigger will not be inserted into the list. 2011-07-12 14:38:40 +01:00
Madhura Jayaratne
be8ce3d5b6 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-07-12 19:04:47 +05:30
Madhura Jayaratne
7802be3c48 Avoid notices about undefined array index 2011-07-12 19:00:44 +05:30
Rouslan Placella
9898cf8609 Coding guidelines for routines. 2011-07-12 14:00:42 +01:00
Rouslan Placella
c8ec2dd8cb Coding guidelines for triggers. 2011-07-12 12:58:23 +01:00
Rouslan Placella
4df98e9e62 Coding guidelines for code common to Routines, Triggers and Events. 2011-07-12 12:02:12 +01:00
Madhura Jayaratne
b9e5125870 Correctly display null and empty values in geometry columns 2011-07-11 22:25:45 +05:30
Madhura Jayaratne
c821997a5a Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-07-11 21:36:38 +05:30
Madhura Jayaratne
3ca86a3929 Protection against malformed WKT and null 2011-07-11 21:29:48 +05:30
Rouslan Placella
262a27232e Coding guidelines for events. 2011-07-11 16:00:43 +01:00
Rouslan Placella
eb33912d8d Merge branch 'master' into rte 2011-07-11 12:30:47 +01:00
Rouslan Placella
a4dd7561b0 SERIAL and BOOLEAN types have no length. 2011-07-11 12:28:09 +01:00
Michal Čihař
4b80c81536 Merge branch 'QA_3_4' 2011-07-10 22:47:34 +02:00
Michal Čihař
ed88c4a7b6 Fix error when gettext is not yet loaded and we want to warn.
This happens when PHP is compiled without session support, which is
checked before gettext is loaded.
2011-07-10 22:46:46 +02:00