Madhura Jayaratne
46722b8035
Merge branch 'master' into OpenGIS
2011-08-17 16:43:18 +05:30
Dieter Adriaenssens
35b3595ec0
coding style and wrapping long lines
2011-08-16 22:39:46 +02:00
Piotr Przybylski
f2842a22bf
Fox comment
2011-08-16 14:35:02 +02:00
Madhura Jayaratne
7d7dd02e8c
Merge branch 'master' into OpenGIS
...
Conflicts:
tbl_select.php
2011-08-13 14:12:46 +05:30
Michal Čihař
d374feb967
Add context to another potentionally unclear message
2011-08-11 09:32:42 +02:00
Aris Feryanto
a9cd487f0f
Fix merge conflict with origin/master
2011-08-10 21:27:31 +08:00
Michal Čihař
c8c9b7501c
Use pgettext for Next/Prev as it is needed for some translations (eg. Chinese)
2011-08-10 13:09:31 +02:00
Madhura Jayaratne
fa3e058e25
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
2011-08-09 06:16:12 +05:30
Marc Delisle
630cdd9915
Missing docblock
2011-08-08 12:31:49 -04:00
Michal Čihař
90e7b75189
Fix indentation
2011-08-08 17:40:00 +02:00
Michal Čihař
9317162dcc
Fix indentation
2011-08-08 17:39:19 +02:00
Michal Čihař
f7d85630ed
Improve coding style
2011-08-08 17:38:26 +02:00
Michal Čihař
bc17e5eedd
Fix indentation
2011-08-08 17:37:49 +02:00
Michal Čihař
617f6f5c24
Adjust switch blocks to PEAR coding standards
2011-08-08 17:36:16 +02:00
Michal Čihař
4b61ccb92e
Reintroduce trailing \n
2011-08-08 16:23:14 +02:00
Michal Čihař
3803a1cde4
Single call of strtr instead of three str_replace
2011-08-08 16:20:37 +02:00
Michal Čihař
3d621fd3af
Simplify replace logic
2011-08-08 16:19:05 +02:00
Michal Čihař
5379b55691
Coding style
2011-08-08 16:17:48 +02:00
Michal Čihař
c722d0d696
Simplify escape functions usint strtr
2011-08-08 16:16:47 +02:00
Michal Čihař
323026c0ea
Use strtr instead of str_replace and array_keys/values combo
2011-08-08 16:15:24 +02:00
Michal Čihař
fcf2a7be85
Improve coding style
2011-08-08 16:12:11 +02:00
Michal Čihař
fd5bf0e64e
Avoid disambigution with Sun as a star
2011-08-08 15:59:46 +02:00
Michal Čihař
e35debd7b5
Proper placement of l10n comments
2011-08-08 15:50:43 +02:00
Michal Čihař
3f2ffbe297
Avoid defining link several times
2011-08-08 15:48:23 +02:00
Michal Čihař
1fae25710d
Wrap long line
2011-08-08 15:46:37 +02:00
Michal Čihař
b9e17020b8
Whitespace cleanup
2011-08-08 15:46:18 +02:00
Michal Čihař
dae7d3bd4a
Improve code readability
2011-08-08 15:46:05 +02:00
Michal Čihař
21afd17860
Wrap long line
2011-08-08 15:45:47 +02:00
Marc Delisle
1fa702b45c
Coding style
2011-08-08 08:27:10 -04:00
Tyron Madlener
bfdf28e24c
Workaround too small value of suhosin.get.max_value_length
2011-08-08 08:25:20 -04:00
Michal Čihař
8f618e6f01
Convert more occurences of inline autosubmit code to external js
2011-08-08 13:29:20 +02:00
Madhura Jayaratne
0e84927693
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
...
Conflicts:
libraries/common.lib.php
2011-08-08 07:45:53 +05:30
Michal Čihař
cdd2044274
Add some missing spacing in docblocks
2011-08-05 15:50:14 +02:00
Michal Čihař
b6c6e79dc2
Reformat docblock
2011-08-05 15:13:40 +02:00
Michal Čihař
1ec0b69e6b
Coding style, function definitions
2011-08-05 14:49:23 +02:00
Michal Čihař
83d3c0d2fd
Move attribute processing to PMA_extractFieldSpec
2011-08-04 17:08:49 +02:00
Michal Čihař
542738dd88
Export print_type and make it usable for set/enum as well
2011-08-04 16:33:34 +02:00
Michal Čihař
5adf2fb352
Processing of varbinary fields
2011-08-04 16:21:47 +02:00
Michal Čihař
57dcfb780a
Fater processing
...
- use preg_replace return value instead going through string again
- use strpos instead of strstr, which is faster and consumes less memory
according to PHP docs
2011-08-04 16:20:42 +02:00
Michal Čihař
b604a67c50
Optimize matching
...
- avoid calling twice same preg_match
- do case sensitive match as we have the string in lower case
2011-08-04 16:15:13 +02:00
Michal Čihař
04c5a81b8c
Make short type also always lowercase
2011-08-04 16:10:41 +02:00
Michal Čihař
42df62c050
Make type lowercase everytime
2011-08-04 16:09:17 +02:00
Michal Čihař
b231ab4072
Factor out some type matching
2011-08-04 15:56:56 +02:00
Michal Čihař
398d5abbda
Use PMA_DBI_get_columns
2011-08-04 15:43:07 +02:00
Michal Čihař
0d9a0cb42b
Simplify logic
2011-08-04 13:49:15 +02:00
Michal Čihař
4fb5b65fd2
Remove unused parameter $container from PMA_getIcon
2011-08-04 13:47:44 +02:00
Michal Čihař
7a07c42de5
Variable include_box is not used
2011-08-04 13:40:49 +02:00
Michal Čihař
eae8396f1e
Factor out pow function detection
2011-08-04 13:39:11 +02:00
Aris Feryanto
53fec4ac4d
Merge branch 'recent' into aris
2011-08-04 18:27:46 +08:00
Madhura Jayaratne
175a6e0948
Use hexadecimal form to create a unique condition for geometry fields
2011-08-03 18:11:32 +05:30
