mark_story
3b8208be2e
Merge branch 'master' into 2.5
2013-11-18 21:49:13 -05:00
Mark Story
cc94026f7e
Merge pull request #2358 from mathop/2.4-html-meta-icon
...
Fix duplicated webroot path on HtmlHelper::meta('icon').
2013-11-18 18:07:36 -08:00
Matheus Pedroso
4677ddf490
Fix duplicated webroot path on HtmlHelper::meta('icon').
2013-11-18 23:38:01 -02:00
ADmad
dda6080579
Merge branch 'master' into 2.5
2013-11-19 00:27:12 +05:30
Mark Story
df52e85e0c
Merge pull request #2338 from ravage84/hash-linked
...
Added link to three hash methods
2013-11-16 18:53:45 -08:00
Marc Würth
229bd69903
Added link to three hash methods
2013-11-17 03:40:39 +01:00
mark_story
016c3aed44
Add test for saveAssociated and expression objects.
...
Add a test for #1514 . This issue was fixed during recent refactorings.
Closes #1514
2013-11-16 10:51:14 -05:00
mark_story
cee2801700
Add 'metadata' to the uninflected list.
...
Fixes #2332
2013-11-15 21:49:05 -05:00
mark_story
b6b8d83980
Remove non-portable data type from MySQL.
...
'numeric' is a non-portable type that is not supported by any other
database driver. Removing it now will prevent future problems.
2013-11-14 10:28:09 -05:00
Mark Story
17ae40f0ce
Merge pull request #2319 from ravage84/php-5-removal
...
Removed "PHP 5" from file header DocBlocks
2013-11-14 06:41:31 -08:00
Mark Story
2e1f1312f9
Merge pull request #2318 from ravage84/mo-files
...
Changed .mo files from text to binary
2013-11-13 15:16:09 -08:00
Mark Story
d8e9f53bf1
Merge pull request #2320 from ravage84/copyright+license-fixes
...
Fixed some copyright and license statements in the file header DocBlocks
2013-11-13 15:15:09 -08:00
Marc Würth
7018997979
Fixed some copyright and license statements in the file header DocBlocks
2013-11-14 00:07:03 +01:00
Marc Würth
7cfa0116f4
Removed "PHP 5" from file header DocBlocks
...
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
2013-11-13 22:58:39 +01:00
Mark Story
4f0d9b30a9
Merge pull request #2317 from ravage84/replace-ogtsl
...
Replaced all remaining license references to the Open Group Test Suite L...
2013-11-13 10:16:10 -08:00
Marc Würth
c02bc2ef07
Changed .mo files from text to binary
...
Kudos to @ADmad
ab2edbe4dd (commitcomment-4555720)
2013-11-13 19:14:54 +01:00
Marc Würth
ce47890e98
Replaced all remaining license references to the Open Group Test Suite License with the MIT License
2013-11-13 18:52:06 +01:00
Mark Story
3ddbddc2f1
Merge pull request #2200 from ravage84/skip-validation-baking
...
Implemented skipping of fields for the data validation rules when baking.
2013-11-13 05:24:20 -08:00
Marc Würth
19b972cfeb
Implemented skipping of fields for the data validation rules when baking a model
2013-11-13 13:36:19 +01:00
Andy Dawson
d94c187adc
Merge pull request #2305 from kimegede/docblock-construct-destruct-return-void
...
Docblock construct destruct remove @return
2013-11-13 01:44:35 -08:00
mark_story
a07608cbb9
Fix incorrect CSRF token fields when using postLink()
...
Creating a postLink after creating a GET form would result in the
incorrect fields being generated.
Fixes #2308
2013-11-11 21:56:55 -05:00
mark_story
1f5d1eee98
Remove duplicated reference for behaviors in ClassRegistry
...
The 2nd key in the registry was to support persistModel which has long
since been removed. With this registry key not being used it can be
removed with reasonable safety.
Fixes #2306
2013-11-11 12:30:00 -05:00
Kim Egede Jakobsen
18e0dc95dd
Remove @return from docblock (for __construct && __destruct methods)
2013-11-11 14:54:48 +01:00
Kim Egede Jakobsen
f0205f53ad
Try to make same comments for constructors.
...
Conflicts:
lib/Cake/I18n/L10n.php
2013-11-11 11:03:57 +01:00
mark_story
fc170770d5
Merge branch 'ticket-4059' into 2.5
...
Merge the changes from pull request #1638 into 2.5.
This set of changes combines the listeners from the global and local
event managers into one ordered set of listeners. This makes the
cognitive load lower around events, as there are no longer two separate
priority queues for the global and local managers.
Closes #2105
2013-11-10 22:35:23 -05:00
mark_story
63d867c98b
Restore global event managers that were causing cascading failures.
...
Refs #2105
2013-11-10 22:35:00 -05:00
Andy Hobbs
3e373771d7
Corrected coding standards violations in CaKeEventManagerTest.php
...
- Changed combining of arrays in CakeEventManager::listeners() to be more efficient
Refs #2105
2013-11-10 22:34:50 -05:00
Andy Hobbs
7656ffd12e
Corrected coding standards violations in CateEventMAnagerTest.pnp
...
Refs #2105
2013-11-10 22:34:43 -05:00
Andy Hobbs
11db7c1631
Removed EventManager test that tested using a closure as it breaks compatability with php < 5.3.0
...
Refs #2105
2013-11-10 22:34:35 -05:00
Andy Hobbs
615f700d22
Added EventManager::prioritisedListeners() function to alow the global event manager to return unprocessed listeners array
...
Refs #2105
2013-11-10 22:34:27 -05:00
Andy Hobbs
e8984a9033
Profiles and optimised EventManager::listeners() function, reducing execution time by 14.5%
...
Refs #2105
2013-11-10 22:34:05 -05:00
mark_story
3561929be7
Merge branch 'master' into 2.5
2013-11-10 21:53:09 -05:00
Mark Story
9d18a5da78
Merge pull request #2300 from cusspvz/patch-1
...
Model.php PHPDoc Description: Change afterFilter with afterFind
2013-11-10 10:43:05 -08:00
José Moreira
b1e366c500
Model.php PHPDoc Description: Chang afterFilter with afterFind
2013-11-10 16:59:28 +00:00
mark_story
8d38861a2e
Fix missing HTML encoding on URL's generated by Html->meta().
...
The input URL was not correctly handled as an asset URL and thus was
not correctly HTML or URL escaped. This created invalid HTML when
favicon URLs included query string arguments.
Refs #2233
2013-11-09 14:31:09 -05:00
mark_story
bf2f2e772e
Split existing tests up, and add tests for Router based image URL's
...
Refs #2233
2013-11-09 12:00:56 -05:00
mark_story
3c1f775ab2
Merge branch 'master' into 2.5
2013-11-09 09:37:27 -05:00
mark_story
ada0ec4c77
Fix formatting of decimal values when there is no fractionSymbol.
...
When a currency format does not include a fractionSymbol it should be
able to format fractional values.
Fixes #2253
2013-11-09 09:36:38 -05:00
mark_story
407c420176
Remove CRLF from To headers in MailTransport.
...
Like other header fields To should not contain CRLF.
Refs #2209
2013-11-08 13:25:51 -05:00
mark_story
2e7d687b98
Merge branch 'master' into 2.5
2013-11-07 23:01:25 -05:00
Mark Story
d7977c6812
Merge pull request #2282 from bcrowe/hotfix-returnType
...
Add missing return type
2013-11-07 20:01:07 -08:00
Bryan Crowe
9ee5efaa2d
Add missing return type
2013-11-07 22:14:11 -05:00
mark_story
145dbacb78
Fix incorrectly encoded headers in MailTransport.
...
When encoded values are present in header fields, they need to have
newlines removed as leaving the newlines in place and interfere with
delivery on Qmail based SMTP servers.
Fixes #2209
2013-11-04 22:17:21 -05:00
José Lorenzo Rodríguez
ebd2132d72
Merge pull request #2274 from ADmad/feature/postlink-buffer
...
Added buffering of form tags generated by FormHelper::postLink()
2013-11-04 01:29:56 -08:00
ADmad
d647fe8a91
Added buffering of form tags generated by FormHelper::postLink()
2013-11-03 23:11:11 +05:30
mark_story
afd182898f
Merge branch 'master' into 2.5
2013-11-01 16:54:57 -04:00
ADmad
f3284d9e5b
Merge pull request #2263 from davidsteinsland/2.5
...
Added configurable default value to Hash::get()
2013-11-01 07:10:22 -07:00
mark_story
d8acf531cb
Merge branch 'postgres-sequence'
...
Merge changes for pull request #2248
2013-10-31 19:53:51 -04:00
mark_story
9e4ac31dc3
Correctly identifier quote column names before adding them to queries.
...
Closes #2248
2013-10-31 19:53:42 -04:00
davidsteinsland
94998763a5
Fixing whitespace
2013-10-31 23:58:52 +01:00
