Jose Lorenzo Rodriguez
9d07fc4330
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/ShellDispatcher.php
lib/Cake/Utility/CakeNumber.php
lib/Cake/View/Elements/sql_dump.ctp
2013-08-11 23:31:10 +02:00
José Lorenzo Rodríguez
890d4a9e2c
Merge pull request #1478 from aleho/2.4
...
Use a protected method to generate confirm() links
2013-08-11 13:51:29 -07:00
José Lorenzo Rodríguez
3355544ab7
Merge pull request #1507 from ADmad/2.3-console-constants
...
Allow setting path constants in app/Console/cake.php as you can in webro...
2013-08-11 12:28:49 -07:00
ADmad
8150b89aba
Allow setting path constants in app/Console/cake.php as you can in webroot/index.php
2013-08-12 00:54:50 +05:30
José Lorenzo Rodríguez
42bb766d92
Merge pull request #1503 from tigrang/cake-response-multi-header
...
Cake response multi header. Fixes #3960
2013-08-11 12:19:26 -07:00
Mark Story
de479cfe8d
Merge pull request #1493 from dereuromark/2.4-cleanup
...
remove undocumented code and unnecessary in_array() checks + cleanup
2013-08-11 08:06:00 -07:00
Jan Dorsman
39a1d76d08
Updating some View files to follow convention
2013-08-11 11:46:35 +02:00
José Lorenzo Rodríguez
cdb05b8bbc
Merge pull request #1505 from jameswatts/feature/http-status-codes
...
Updated the handling of HTTP status codes in the response
2013-08-10 06:22:11 -07:00
James Watts
f76046625b
Updated doc block comment
2013-08-10 14:45:00 +02:00
James Watts
19afed0003
Updated unit test for HTTP status codes
2013-08-10 13:32:49 +02:00
James Watts
2ce2a2aaa9
Updated the handling of response status codes
...
Improved API integrity by blocking the ability to set invalid status codes according to the HTTP spec. This includes any non-numeric codes, or any code that is greater or less than 3 digits in length (100-999 being the accepted range).
2013-08-10 13:30:02 +02:00
Tigran Gabrielyan
f6e1c7ca3d
Improve code readability
2013-08-09 20:26:17 -07:00
Tigran Gabrielyan
777a46ff6d
Fix CS issue
2013-08-09 20:00:33 -07:00
Mark Story
f63aa922f6
Merge pull request #1497 from hiromi2424/fix-unlink-windows
...
Fix unlink() for CacheEngine::clear() failed on windows.
Refs #3930
2013-08-09 19:55:15 -07:00
Mark Story
4b2117501e
Merge pull request #1501 from ADmad/2.4-deprecate-sanitize
...
2.4 deprecate sanitize
2013-08-09 11:47:12 -07:00
ADmad
1d809e9807
Deprecated Sanitize class
2013-08-10 00:10:05 +05:30
mark_story
86dcebf28b
Update bakeshell so bake all
gets the correct connection name.
...
Fixes #3972
2013-08-09 10:08:01 -04:00
hiromi2424
29314e0fcc
Fixing some errors related to unlink() on windows
2013-08-09 21:33:21 +09:00
hiromi2424
dc381dd4d3
Fix unlink() for CacheEngine::clear() failed on windows.
2013-08-09 21:32:57 +09:00
Marc Würth
2a540ff8a8
Fix for #3515 , functional extension & tests
...
https://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/3515
I used (string) because it is faster than strval() and there are no real benefits in this case.
Also enabled assign(), append() and prepend() to take any values convertible to string.
Removed try/catch as discussed with ADmad.
Changed the three exception expecting tests to check for PHPUnit_Framework_Error now.
2013-08-09 01:34:08 +02:00
Marc Würth
4c13a39f3e
Removed else clauses after redirects and added return before redirect() and flash() calls
2013-08-08 21:10:41 +02:00
Mark Story
49d66af12e
Merge pull request #1491 from ravage84/sql_dump
...
Improved code readability
2013-08-08 11:45:39 -07:00
Marc Würth
14f876fbc9
Improved code readability
...
Changed table echo to printf for more readable code
Wrapped sql_dump error message in __d(), as discussed here:
4c4fdc6f70 (commitcomment-3155723)
and here:
https://github.com/cakephp/cakephp/pull/1491/files#r5646701
2013-08-08 15:43:37 +02:00
euromark
fc2d28974b
remove undocumented code and uncessary in_array() checks + cleanup
2013-08-08 03:56:58 +02:00
Mark Story
8ccdf629bb
Merge pull request #1492 from dereuromark/master-phpcs
...
coding standards according to new sniffer rules
2013-08-07 18:42:19 -07:00
euromark
e7e5f46916
prevent rtrim to remove whitespace from test
2013-08-08 01:14:31 +02:00
euromark
1339a9dfe1
coding standards according to new sniffer rules
2013-08-08 01:03:21 +02:00
Mark Story
2dd423644b
Merge pull request #1490 from dereuromark/2.4-mime
...
2.4 mime
2013-08-07 14:52:01 -07:00
euromark
e1365336e2
avoid notice in mime()
2013-08-07 23:35:19 +02:00
Mark Story
19b4021276
Merge pull request #1486 from dmromanov/translation-title
...
Do not translate "CakePHP"
2013-08-07 13:52:19 -07:00
Mark Story
dfb000fb89
Merge pull request #1488 from dmromanov/translation-optimization
...
Combined strings of Testsuite Shell's description to a one translatable ...
2013-08-07 13:51:44 -07:00
dmromanov
af48904117
Combined strings of Testsuite Shell's description to a one translatable sentence.
2013-08-08 00:28:38 +04:00
D. Romanov
4d3c049f25
Do not translate "CakePHP"
2013-08-07 22:54:19 +04:00
ADmad
faa4262969
Merge pull request #1305 from jrbasso/2.4-fix-asset-full-url
...
Fixed full urls on asset methods
2013-08-07 10:29:11 -07:00
Mark
6c30851783
Merge pull request #1424 from dereuromark/2.4-form-helper-datetime-rounding
...
provide ability for rounding - closes #1986
2013-08-07 10:15:35 -07:00
Mark Story
054668f149
Merge pull request #1194 from dereuromark/2.4-file-improvements
...
Allow creating of missing tmp directories in debug (development) mode
2013-08-07 09:52:07 -07:00
mark_story
e36c537cf6
Switch from LEFT to INNER joins.
...
INNER joins are often more efficient as they can result in fewer rows
being examined before a result set is generated.
Fixes #3968
2013-08-07 12:50:02 -04:00
euromark
f5859ca719
allow creating of missing tmp directories in debug (development) mode for cache and log to avoid unnecessary errors thrown - using 0775 for dirs and 0664 for files
2013-08-07 13:24:45 +02:00
ADmad
339cd00fec
Merge pull request #1482 from ADmad/2.4-l10n
...
L10n cleanup
2013-08-07 00:42:09 -07:00
Mark Story
dc15c78710
Merge pull request #1483 from tigrang/debugger-fix
...
Added case for `unknown` type.
Fixes #3966
2013-08-06 19:39:13 -07:00
mark_story
9efad54e31
Fix missing expiry times on cookies.
...
When writing multiple cookies in a single request with the default
expiry time, cookies after the first should continue to have the default
expiry time used.
Fixes #3965
2013-08-06 22:01:13 -04:00
Juan Basso
330f8d168d
Merge pull request #1228 from jrbasso/2.4-router-parse
...
Supoprt query parameters on Router::parse.
2013-08-06 18:57:37 -07:00
Tigran Gabrielyan
2150e8dce5
Added case for unknown
type. Fixes #3966
2013-08-06 18:30:00 -07:00
Mark Story
33af7e2e52
Merge pull request #1426 from dereuromark/2.4-currency-fraction
...
Fix currency output for fraction values.
Fixes #1329
2013-08-06 18:19:01 -07:00
Mark Story
3f186d6c97
Merge pull request #1484 from tigrang/code-cleanup
...
Loop instead of duplicate code
2013-08-06 18:12:12 -07:00
Tigran Gabrielyan
84dcd30730
Loop instead of duplicate code
2013-08-06 15:50:58 -07:00
euromark
ad6fcd43d7
Fix currency output for fraction values using fractionExponent option.
2013-08-07 00:36:37 +02:00
ADmad
18cd3729e4
Deprecated DEFAULT_LANGUAGE constant and config value 'Config.language' is not used for default.
...
Cleaned up L10n::_setLanguage(). Removed unused L10n::$found
2013-08-07 03:37:26 +05:30
Tigran Gabrielyan
34d848d0ca
Fixed order of assert params
2013-08-06 12:59:36 -07:00
Mark Story
f57e315061
Merge pull request #1480 from uzyn/fix/shell-space-docroot
...
Fixes a bug where server would not run when there are spaces in documentRoot
2013-08-06 10:01:51 -07:00