mark_story
3aa189eb3a
Fix cookie expiry time calculation on 32bit systems.
...
strtotime() misbehaves on 32bit systems when the resulting timestamp
would overflow an integer. Use a DateTime to workaround this issue.
Fixes #3868
2013-06-03 20:16:18 -04:00
mark_story
027cfe9496
Fix typo.
2013-06-02 18:12:51 -04:00
ADmad
f3c69c9f40
docblock updates
2013-06-03 01:04:00 +05:30
mark_story
cbf3228c34
Fix inconsistent name/alias usage.
...
TranslateBehavior should always use name instead of alias when
creating/updating/saving new translate records. It already uses name
when finding translations and the mismatch was causing translations to
not be found when saved from an aliased model.
Thanks to Joost de Keijzer for providing the initial patch.
Fixes #3865
2013-06-02 13:50:23 -04:00
ADmad
3303a2cda1
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
lib/Cake/Console/Templates/skel/Config/acl.ini.php
lib/Cake/Console/Templates/skel/Config/acl.php
lib/Cake/Console/Templates/skel/Config/bootstrap.php
lib/Cake/Console/Templates/skel/Config/core.php
lib/Cake/Console/Templates/skel/Config/database.php.default
lib/Cake/Console/Templates/skel/Config/email.php.default
lib/Cake/Console/Templates/skel/Config/routes.php
lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
lib/Cake/Console/Templates/skel/Console/cake.bat
lib/Cake/Console/Templates/skel/Console/cake.php
lib/Cake/Console/Templates/skel/Controller/AppController.php
lib/Cake/Console/Templates/skel/Controller/PagesController.php
lib/Cake/Console/Templates/skel/Model/AppModel.php
lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
lib/Cake/Console/Templates/skel/View/Pages/home.ctp
lib/Cake/Console/Templates/skel/index.php
lib/Cake/Console/Templates/skel/webroot/index.php
lib/Cake/Console/Templates/skel/webroot/test.php
2013-06-02 18:03:59 +05:30
Saleh Souzanchi
ca44413689
fix Form::_selectOptions, when disabled attribute is not array so do not be disabled item of options
2013-06-01 14:16:23 +04:30
mark_story
be2a252345
Fix coding standards.
2013-05-31 10:37:20 -04:00
Mark Story
4b7c128f04
Merge pull request #1320 from ravage84/docblock-improvements
...
Improved the DocBlocks and other code cleanup
2013-05-31 07:36:04 -07:00
Mark
525bf3b362
Merge pull request #1297 from dereuromark/master-email-wrapping
...
enforce a better email wrapping to send valid emails
2013-05-31 07:30:32 -07:00
Marc Würth
4c9f0414cb
Improved the DocBlocks and other code cleanup
...
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
Jose Lorenzo Rodriguez
4bc92b822e
Adding App.fullbaseURL as a recognized Configure value
2013-05-30 16:07:26 +02:00
Sebastián Marcos Arce
bf6c3854e5
Update HttpSocketTest.php
...
Update tests.
2013-05-30 10:13:31 -03:00
Sebastián Marcos Arce
fe774ecc03
Update HttpSocket.php
...
Add 'allow_self_signed' SSL context option.
2013-05-30 10:06:10 -03:00
Marc Würth
2bbd391972
Synced PHP version annotations
...
CakePHP seems to be just "PHP 5" as opposed to the PEAR header comment standard "PHP version 5"
http://pear.php.net/manual/en/standards.header.php
2013-05-29 20:19:14 +02:00
Mark Story
bed60b5d82
Merge pull request #1312 from ravage84/package-fixes
...
Fixed or removed some package/subpackage definitions to reflect director...
2013-05-29 10:14:00 -07:00
Marc Würth
e7eb09bc23
Renamed ...Controller package to ...View
...
Probably a leftover from splitting in 09e7f1d491
2013-05-29 17:20:41 +03:00
Christian Winther
2eb9841c54
Add short option for theme in BakeShell
2013-05-29 13:49:51 +00:00
Christian Winther
5aac41ed43
Fix indentation and add short option 't' for template
2013-05-29 13:49:12 +00:00
Christian Winther
ae3d9a7a8e
Remove ` from help line
2013-05-29 13:46:13 +00:00
Christian Winther
2fca41c35d
Enable the user to provide a CLI theme through the --theme option for all bake tasks
2013-05-29 13:41:57 +00:00
Marc Würth
29cc6b3652
Fixed or removed some package/subpackage definitions to reflect directory structure
...
Lowercase cake instead of Cake
Tests instead of Test
Fixtures instead of Fixture
2013-05-29 15:00:18 +02:00
Damien Biasotto
e1c27af9e9
Fix typo variable name in _deleteDependent().
...
It's not a big deal but there was a typo in _deleteDependent() method.
$savedAssociatons instead of $savedAssociations.
2013-05-29 14:25:39 +03:00
mark_story
cce9e84907
Merge branch 'master' into 2.4
2013-05-28 22:40:32 -04:00
mark_story
06cf62aefe
Fix failing tests.
...
Refs GH-1307
2013-05-28 22:38:01 -04:00
Mark Story
aa9f221254
Merge pull request #1307 from Jippi/hotfix/debug-in-cli-should-include-newline
...
debug() in CLI should include newline..
2013-05-28 19:31:41 -07:00
Mark Story
b111750494
Merge pull request #1308 from Jippi/hotfix/sql-bug-with-not-in-with-one-key
...
Hotfix/sql bug with NOT in with one key
2013-05-28 10:21:21 -07:00
Ceeram
49aded5399
fix coding standard error
2013-05-28 18:39:38 +02:00
Mark Story
05f58a700c
Merge pull request #1306 from Jippi/hotfix/notice-should-be-styled-too
...
Adding color output for notice / LOG_NOTICE in ConsoleOutput
2013-05-28 09:07:34 -07:00
Christian Winther
ef8603e1a7
Add unit test
2013-05-28 12:02:58 +00:00
Christian Winther
4752fcd713
Adding color output for notice / LOG_NOTICE in ConsoleOutput
2013-05-28 11:59:37 +00:00
Christian Winther
d14f0cece4
debug() in CLI should include newline..
...
If not, two debug() statements after each other is very hard to read, as the #### separater is on the same line
2013-05-28 11:57:59 +00:00
Christian Winther
9e6120c86a
This fixes an issue where attempting to use "!=" in a condition with an array with only a single element generates invalid SQL.
...
Example:
$condition['Model.id !='] = array(1, 2); //Generates Model.id NOT IN (1, 2) as expected
$condition['Model.id !='] = array(1); //Generates Model.id != = (1) which is invalid SQL
Patch will cause the above to generate Model.id != (1);
This an implimentation of @markstory's suggestion on PR 1232
2013-05-28 11:54:31 +00:00
euromark
bebb8ec416
do not translate error message in test case
2013-05-28 03:25:52 +02:00
mark_story
7334643b55
Fix issues with getting Xml as SimpleXmlElement and invalid Xml.
...
Fixes #3855
2013-05-27 13:22:14 -04:00
mark_story
41e0c524f2
Only try to use CakeErrorController if AppController exists.
...
This fixes missing error pages when there are parse errors in
AppController.
Fixes #3850
2013-05-26 22:11:53 -04:00
ADmad
00f972f033
Deprecated AuthComponent::password()
2013-05-27 00:25:42 +05:30
ADmad
56fa0dccda
Remove unnecessary overriding of '_findUser()' in 'DigestAuthenticate'.
2013-05-26 12:31:40 +05:30
ADmad
dd2892ad8d
Added password hasher
2013-05-26 11:29:06 +05:30
ADmad
36c592e72e
Merge branch 'master' into 2.4
2013-05-26 11:23:53 +05:30
Mischa ter Smitten
c0039f642e
Output to stderr, not stdout
2013-05-25 23:19:31 +02:00
Mischa ter Smitten
caec0abcfc
Fix for ExtractTask does not check output directory (ticket 3852)
2013-05-25 22:32:07 +02:00
mark_story
9ee610757e
Throw exceptions when invalid permission keys are used.
...
Silently 'failing' to save permissions is bad, throw exceptions instead.
Fixes #3851
2013-05-24 21:47:22 -04:00
Rachman Chavik
a63b54c34b
Fix: Incorrect model being used as Controller::$modelClass
...
We cannot be sure that Controller::$uses have not been iterated, so
reset the array to use the first value.
2013-05-24 17:50:43 +07:00
euromark
75b5a323e4
enforce a better email wrapping to send valid emails
2013-05-23 18:34:39 +02:00
mark_story
ca1f9e800e
Make CakeEmail::config() merge configuration.
...
This allows you to incremementally overwrite configuration and better
matches other config methods in CakePHP.
Fixes #3848
2013-05-23 09:47:24 -04:00
mark_story
85a906c0fc
Expand doc blocks.
2013-05-23 09:45:50 -04:00
ADmad
11e428bca3
Fix docblock
2013-05-23 01:02:07 +05:30
Mark Story
074b21591c
Merge pull request #1294 from ADmad/2.3-bugfix-smtp
...
Ensure passing empty array to SmtpTransport::config() does not reset exi...
2013-05-22 06:21:07 -07:00
Mark Story
085ebae1d3
Merge pull request #1295 from cakephp/master-i18n-fixes
...
Master i18n fixes
2013-05-22 06:20:04 -07:00
euromark
fa02a2efc9
unify "Are you sure you want to delete"
2013-05-22 12:15:33 +02:00
euromark
e3e11a48e6
fix some domain translations and remove leftover true param from 1.x
2013-05-22 11:15:01 +02:00
ADmad
eccdf3bf60
Ensure passing empty array to SmtpTransport::config() does not reset existing config.
...
Synced args and return value with AbstractTransport::config().
Fixes #3840
2013-05-22 11:36:31 +05:30
Mark Story
1357b00843
Merge pull request #1289 from gilleswittenberg/master
...
Allow setting type attribute on script block tags
2013-05-21 13:27:35 -07:00
mark_story
408aac4798
Update return types.
2013-05-21 15:45:22 -04:00
Gilles Wittenberg
6d996d52ce
Allow setting different type on scriptStart + scriptEnd
2013-05-21 20:14:44 +02:00
Gilles Wittenberg
f19615a3be
Allow setting different type on scriptBlock
2013-05-21 20:14:44 +02:00
Mark Story
28a3b73bdc
Merge pull request #1292 from openam/HtmlHelper
...
make HtmlHelper::tag() just return the $text content with no wrapping tag when $name === false
2013-05-21 08:44:08 -07:00
Mark Story
e2304d8fd6
Merge pull request #1293 from kunit/2.3-cakeemail-wrap
...
Processing was simplified when a length of one line was smaller than CakeEmail::LINE_LENGTH_MUST
2013-05-20 19:24:41 -07:00
mark_story
82d57fb8b2
Add mocked components to the enable list of components.
...
Mocked components should be enabled so they receive callbacks. This
allows more realistic integration tests using testAction(). Stop
disabling the constructor as it causes a number of errors with
components that use components.
Fixes #3842
2013-05-20 22:22:22 -04:00
mark_story
9cdc3927f2
Tidy up variable names.
...
Variables with _ in them are confusing, try to use clearer names.
2013-05-20 21:52:08 -04:00
TAKAHASHI Kunihiko
05473fe7d0
Processing was simplified when a length of one line was smaller than CakeEmail::LINE_LENGTH_MUST
2013-05-21 10:50:46 +09:00
Michael Tuttle
0d082b599a
changed HtmlHelper::tag() just return $text when empty($name)
2013-05-20 17:36:51 -06:00
Mark Story
631082a2a4
Merge pull request #1284 from jmillerdesign/public-cakeemail-readfile
...
Utilize File utility to base64 encode email attachments
2013-05-20 08:19:39 -07:00
J Miller
b42a2d45e7
Remove readBase64() from File utility, since it is not commonly used.
2013-05-19 22:00:42 -07:00
Michael Tuttle
12462b2e51
make HtmlHelper::tag() just return the $text content with no wrapping tag when $name === false
2013-05-19 22:00:27 -06:00
ADmad
fb86859585
Merge branch 'master' into 2.4
2013-05-19 14:37:41 +05:30
mark_story
f8c6138ad7
Fix incorrect exception type when double slash paths are used.
...
Fixes #3838
2013-05-18 12:20:06 -04:00
J Miller
987c01856a
Change variable name to be descriptive
2013-05-17 19:01:18 -07:00
mark_story
e23c4ffad9
Fix empty response bodies when redirect URL's are empty.
...
When redirecting XHR requests to an empty URL the response body should
not be overwritten.
Fixes #3835
2013-05-17 16:33:08 -04:00
Mark Story
9147f545fe
Merge pull request #1286 from kunit/master
...
CakeEmail::_wrap does not operate correctly by the character string of specific Japanese.
2013-05-17 13:17:13 -07:00
J Miller
277ec8d89b
Update link url to revised method name
2013-05-17 10:28:06 -07:00
J Miller
ea534002c3
Add to docblock the reason why the output is chunk_split
2013-05-17 08:44:46 -07:00
euromark
e1d6bb2120
code is not translatable and should not be part of the translation strings
2013-05-17 15:54:55 +02:00
TAKAHASHI Kunihiko
f541260350
Add TestCase for Network/Email/CakeEmail.php
2013-05-17 18:56:52 +09:00
TAKAHASHI Kunihiko
a562d9c04e
The assembly of the message was not correctly completed in specific Japanese.
2013-05-17 18:36:53 +09:00
euromark
97c2cb367d
CS fixes
2013-05-17 10:36:17 +02:00
J Miller
4a4ca7c8d4
Make readBase64 an instance method
...
Leverage the existing code in File::read() and simply add in chunking and base64 encoding.
2013-05-16 18:56:46 -07:00
mark_story
72b75660e5
Merge branch 'master' into 2.4
2013-05-16 21:31:27 -04:00
J Miller
dfdde954ea
Create method readAndBase64Encode() in File utility.
...
Move this utility method out of CakeEmail, which allows other Mail transports to encode files manually. Maintains BC.
2013-05-16 13:20:59 -07:00
José Lorenzo Rodríguez
e466af05b9
Removing copy pasted extra line
2013-05-16 17:25:39 +02:00
Jose Lorenzo Rodriguez
e9d50ebabb
Improving doc blocks
2013-05-16 16:06:17 +02:00
J Miller
f47609bd61
Allow readFile() in CakeEmail to be accessed publicly
...
I needed this method while building a Transport, and saw no reason why it needed to be protected.
2013-05-15 23:27:05 -07:00
Jose Lorenzo Rodriguez
785c17d199
Fixing docblocks
2013-05-15 09:52:25 +02:00
Jose Lorenzo Rodriguez
1d61e21eaa
Fixing method visibility
2013-05-14 23:52:39 +02:00
Jose Lorenzo Rodriguez
018e5d0659
Adding Sylog as a logging engine
2013-05-14 23:21:38 +02:00
euromark
9fd2af96a8
add test case
2013-05-14 10:38:10 +02:00
euromark
0822578813
$this->modelClass needs to be correct prior to the components init() call if the component itself accesses the model, lazyloading would try to load the wrong model otherwise
2013-05-14 10:17:57 +02:00
mark_story
f7d106a386
Fix FormHelper::tagIsInvalid with saveMany forms.
...
When saving multiple records validation errors were not correctly shown.
Fudge the entity path so it matches the validation errors set in the
models.
Fixes #3828
2013-05-13 21:09:31 -04:00
mark_story
bd3428e456
Remove Asset.x Configure values.
...
Having Asset.timestamp on can fail tests accidentally.
2013-05-13 21:09:31 -04:00
mark_story
c1b2ca581c
Use terser assertions.
2013-05-13 21:09:31 -04:00
ADmad
4d434ec9f3
Fix CS errors
2013-05-13 23:51:32 +05:30
mark_story
df872dde28
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-05-10 21:58:48 -04:00
Jose Lorenzo Rodriguez
a079ca3f1c
Update version number to 2.3.5
2013-05-11 02:56:56 +02:00
mark_story
6017db9dc8
Add missing urlencoding to base/webroot.
...
This fixes URL generation when PHP_SELF or the request path contains
special characters.
2013-05-10 11:04:46 -04:00
mark_story
f745a02210
Add missing html escaping.
...
This should have been here the whole time. Many of these variables could
contain user input.
2013-05-09 23:12:07 -04:00
mark_story
a49c69acc4
Add missing h() calls to exception stack traces.
2013-05-09 22:23:20 -04:00
mark_story
b533c1b3ba
Make named capture groups compatible with older PCRE versions.
...
CentOS is terrible and generally contains very old versions of PCRE.
Update patterns to use more backwards compatible named capture groups.
Fixes #3821
2013-05-09 12:18:26 -04:00
Daniel Hofstetter
dae978fb3a
Split sentence into two sentences
2013-05-09 10:22:43 +03:00
Pierre Martin
c6d8b477fc
Prevent autoload when checking for the existence of HttpException
...
The class_exists check has been added in 4f29f58a5e (L1R28)
to prevent a side effect with a PECL extension.
However if an autoloader such as the Composer one is loaded, it will try to require this `exceptions.php` file again:
```
'HttpException' => $vendorDir . '/pear-pear.cakephp.org/CakePHP/Cake/Error/exceptions.php',
```
this will result in a "Fatal error: Cannot redeclare class CakeBaseException"
2013-05-08 13:25:42 +03:00
mark_story
cdede82b7e
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Core/Object.php
2013-05-07 22:22:48 -04:00