Commit graph

15857 commits

Author SHA1 Message Date
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
Mark Story
a6bc92719a Merge pull request #1321 from zoghal/form-select-disabled
fix Form::_selectOptions, when disabled attribute is not array so do not...
2013-06-02 10:14:28 -07: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
Mark Story
07dba8d436 Merge pull request #1316 from sarce/patch-2
Add 'ssl_allow_self_signed' option to SSL context in HttpSocket class.
2013-05-30 06:42:10 -07: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
Mark Story
db75a76a60 Merge pull request #1313 from ravage84/php-version-annotations
Synced PHP version annotations
2013-05-29 12:33:23 -07: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
Mark Story
f6b53025f0 Merge pull request #1310 from Jippi/hotfix/allow-bake-tasks-to-provide-theme-as-cli-option
allow bake tasks to provide theme as cli option
2013-05-29 10:13:28 -07:00
ADmad
2a8d3c3e03 Merge pull request #1311 from ravage84/patch-4
Fixed package name in docblock
2013-05-29 07:24:58 -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
ADmad
5c38b7e66c Merge pull request #1309 from damien-biasotto/patch-1
Fix typo variable name in _deleteDependent().
2013-05-29 04:42:27 -07: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
7d06f7b304 Merge pull request #1275 from ADmad/2.4-auth-hashtype
Added password hasher
2013-05-25 23:59:30 -07:00
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
Mark Story
76f4d10d13 Merge pull request #1301 from tersmitten/extracttask-output-directory-bugfix
Fix for ExtractTask does not check output directory

Fixes #3852
2013-05-25 18:34:50 -07:00
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