euromark
6cf147e8c8
unify null checks - avoid method call in favor of strict check
2013-08-16 20:12:49 +02:00
ADmad
8428928fd6
Merge pull request #1528 from mvdriel/caketime-fix
...
Added workaround for strtotime("0000-00-00 00:00:00") returning -6216995...
2013-08-15 10:55:03 -07:00
Mark Story
7c29aa5155
Merge pull request #1508 from fuga/feature/email-config
...
making the config method of email-transport-classes mergable
2013-08-15 08:26:11 -07:00
Mark van Driel
97aaa89b3f
Refactored the fix
2013-08-15 17:13:31 +02:00
Floris
85313e84af
Minor Sanitize::escape() update
...
If the Datasource is not going to be used, do access it.
2013-08-15 12:15:09 +02:00
Mark van Driel
1595287290
Added workaround for strtotime("0000-00-00 00:00:00") returning -62169955200 on a 64 bit system
2013-08-15 08:58:05 +02:00
Mark Story
c040bb0cdc
Merge pull request #1523 from tersmitten/improved-tests-that-use-setlocale
...
Makes the locale test not always pass, be verbose when it is skipped.
2013-08-14 16:54:50 -07:00
Frank de Graaf
33f7de0072
Merge pull request #1520 from mvdriel/cakenumber-fix
...
Cakenumber fix
2013-08-14 13:41:53 -07:00
Mischa ter Smitten
0e49a23065
Makes the locale test not always pass, be verbose when it is skipped.
2013-08-14 22:32:04 +02:00
Mark van Driel
559fb5805b
Fix formatting with locales using , as decimal separator
...
No double number formatting for readable size
Fixed testPrecisionLocalized for travis (when locale is missing?)
Switched locale to nl_NL and fixed test
Skip test when locale is not available
2013-08-14 22:19:38 +02:00
Phally
6f74e1958b
Makes the locale test not always pass, be verbose when it is skipped.
2013-08-14 21:00:31 +02:00
Andras Kende
d84a2d9419
removed $i variable, it not being used...
...
removed $i variable, it not being used...
2013-08-14 02:16:46 -07:00
Andras Kende
3f58be260e
removed not used $i variable
...
removed not used $i variable
2013-08-13 22:06:00 -07:00
mark_story
cb6ea82fea
Allow CakeEmail::template() to disable layout rendering.
...
Fix the code to act as documented. Sending template('view', null) should
disable layout rendering.
Fixes #3983
2013-08-13 14:01:33 -04:00
mark_story
3bdcf7b440
Use inner join instead of a left join.
...
In some database servers an INNER join performs better than a LEFT join.
Fixes #3979
2013-08-13 13:40:59 -04:00
fuga
245611424f
Apply ADmad's patch and update testConfig method according to a new specification.
2013-08-13 17:42:52 +09:00
mark_story
6ce10b28c9
Update doc blocks.
2013-08-12 14:37:43 -04:00
Mark Story
2f5963e2d3
Merge pull request #1496 from ravage84/else-clause-after-redirect
...
Removed else clauses after redirects and added return before redirect() ...
2013-08-12 11:05:39 -07:00
Christian Winther
af1c2a1c51
Merge pull request #1511 from ankr/caketime_accuracy_about
...
Making CakeTime display 'about X ago' when time passed is lower than acc...
2013-08-12 09:23:46 -07:00
ankr
1cb41294b8
Making CakeTime display 'about X ago' when time passed is lower than accuracy
...
Removing unnecessary else
Also support 'about' times for future times
Make 'about' times translateable in all languages
2013-08-12 10:01:38 -04:00
Marc Würth
7d4f229310
Fixed statement about Security:hash's salt parameter
...
Just nitpicking, but it prepends the salt, not appends it:
https://github.com/cakephp/cakephp/blob/master/lib/Cake/Utility/Security.php#L120
2013-08-12 12:52:34 +02:00
fuga
303261e231
making the config method of email-transport-classes mergable into the current config value.
2013-08-12 10:28:17 +09:00
Jose Lorenzo Rodriguez
1bdcc58e31
Update version number to 2.3.9
2013-08-12 00:37:35 +02: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
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
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
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
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
D. Romanov
4d3c049f25
Do not translate "CakePHP"
2013-08-07 22:54:19 +04: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
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
Tigran Gabrielyan
2150e8dce5
Added case for unknown
type. Fixes #3966
2013-08-06 18:30:00 -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
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
U-Zyn Chua
3559aa35af
Removed a stray tab.
2013-08-06 17:13:53 +08:00
U-Zyn Chua
d9b99d0599
Fixes a bug where server would not run when there are spaces in documentRoot.
2013-08-06 15:19:59 +08:00
ADmad
04fb1eb614
Added more tests to db related tests group
2013-08-04 23:38:30 +05:30
ADmad
f68701d647
Created new test group for all db related tests
2013-08-04 21:23:45 +05:30
Christian Winther
cd44c2afae
Merge pull request #1472 from ADmad/bugfix/3948
...
Fixed bug when using multi model fieldList and whitelists for all models...
2013-08-03 05:56:22 -07:00
mark_story
b5edcba309
Unlink files with full path.
2013-08-02 23:41:15 -04:00
mark_story
b999b4d9ae
Fix error when clearing FileCache.
...
I made a mistake in a previous commit that did not account for dir()
returning directory names.
2013-08-02 23:32:17 -04:00
mark_story
1b610a8d62
Move disabling of bootstrap mode to after init().
...
init() loads from the cache which can autoload additional classes. For
example the FileEngine adapter loads Inflector. Loading additional
classes causes the file_map cache to be re-written on each request when
using FileEngine. This results in degraded performance when using
FileEngine.
Fixes #3947
2013-08-02 23:20:13 -04:00
euromark
6c1e60953b
fix cs
2013-08-03 03:02:52 +02:00