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
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
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
Ceeram
49aded5399
fix coding standard error
2013-05-28 18:39:38 +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
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
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
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
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
Mark Story
e695f900c2
Merge pull request #1287 from dereuromark/master-translation-strings
...
code is not translatable and should not be part of translation strings
2013-05-17 13:11:48 -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
José Lorenzo Rodríguez
03a96d4f63
Merge pull request #1285 from dereuromark/master-cs-fixes
...
CS fixes
2013-05-17 01:38:43 -07: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