Thomas Smith
4927cf6901
#2994 , unnecessary calls to Model::__isset(null)
2014-03-10 10:16:32 -07:00
Mike Gibson
60319832b5
Fixed PHPCS error
2014-03-10 15:28:00 +00:00
Mike Gibson
7205f5ec9c
Made it slightly neater
2014-03-10 15:01:52 +00:00
Mike Gibson
d40452b43d
Test if keys are empty before sorting
2014-03-10 14:25:28 +00:00
Mike Gibson
9be789d371
Use array_keys instead of array_flip
2014-03-10 13:29:43 +00:00
Mike Gibson
17652575f3
Fixed key sorting
2014-03-10 13:09:19 +00:00
Mike Gibson
5e896aa94a
Removed comparison method
2014-03-10 13:03:04 +00:00
Mike Gibson
1202658396
Added a test case
2014-03-10 12:03:04 +00:00
Mike Gibson
00956110f5
Sort route keys in reverse length order before replacing to prevent incorrect matching
2014-03-10 11:43:28 +00:00
Kunal Panchal
a77a0f76a1
Documentation correction
...
TimeHelper::$niceFormat to CakeTime::$niceFormat
2014-03-10 14:05:03 +05:30
Jorge González
4d51092259
fixing Set docblocks
2014-03-08 10:26:03 +00:00
Jorge González
6049009cac
improving docblock for Set::extract and Set::classicExtract return types
2014-03-07 19:33:02 +00:00
Rachman Chavik
aa0f1c1862
Fix: Stray [] syntax in php 5.3 codebase
2014-03-07 09:23:06 +07:00
Rachman Chavik
e71d650ade
Fix: Regression with format specifiers in i18n methods
...
Refs: #2589
2014-03-07 09:22:56 +07:00
mark_story
6c3bc48ce0
Merge branch 'master' into 2.5
2014-03-06 17:45:00 -05:00
Mark
3ca338fe26
Merge pull request #2781 from davidsteinsland/2.5
...
Fixed HTTP Status code when ajaxLogin is set
2014-03-06 12:37:51 +01:00
ovidiupruteanu
7b1086e632
Add missing spaces
2014-03-06 05:18:31 +02:00
ovidiupruteanu
56a3f093a1
Sqlserver->describe failing for models with a schemaName
...
When models have a schemaName set it was searching for TABLE_NAME = 'schema_name.table_name'.
Instead it should search for TABLE_NAME = 'table_name' AND TABLE_SCHEMA = 'schema_name'
2014-03-06 04:54:03 +02:00
Mark Story
8b1e5e31c7
Merge pull request #2925 from ndm2/invocation-verification-fix
...
Fix verification of expected invocations
2014-03-04 22:54:54 -05:00
mark_story
5544fcc4c2
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2014-03-03 21:20:58 -05:00
Lucas Freitas
b522b1e724
Entire UL element was being outputted directly (escaped), added to the unset list and fixed
2014-03-03 05:28:59 -03:00
Lucas Freitas
d4b91166bc
Fixing stupidity and adding the PHPDoc param
2014-03-03 05:10:21 -03:00
Lucas Freitas
7096495943
Allow the passing parameter escape of the getCrumbList method and reflecting that into the outputted link too
2014-03-03 05:01:49 -03:00
mark_story
549908738b
Include the last error if available when sending with mail() fails.
...
When sending email using mail() include the last error if available.
Fixes #2910
2014-03-02 21:07:25 -05:00
ndm2
1015b38a27
Use convenience methods to create a (case-insensitive) negation matcher
2014-03-02 17:56:35 +01:00
Marlin Cremers
5795111391
Moved Limburgish to correct the order
2014-03-02 14:30:26 +01:00
Marlin Cremers
7ab028e9d7
Added the Limburgish language
2014-03-02 10:40:39 +01:00
mark_story
45cabd40fe
Update version number to 2.4.6
2014-03-01 21:22:04 -05:00
ndm2
70a1b87db6
Fix wrong test model association class name
2014-03-01 23:01:33 +01:00
ndm2
01e1b5ca61
Fix failing tests caused by already existing classes
2014-03-01 20:24:32 +01:00
ndm2
008ad3237c
Fix verification of expected invocations #2919
2014-03-01 19:06:17 +01:00
ADmad
a707709e1d
Added test for FormHelper::radio().
...
Tests generating radio input for field with model other than one used
in create(). Refs #2911 .
2014-02-28 02:34:16 +05:30
mark_story
706ddfccae
Merge branch '2.5' of github.com:cakephp/cakephp into 2.5
2014-02-26 21:09:06 -05:00
mark_story
25f94f9b71
Add test to prove the fix made in pull/2899
...
Ensure that event listeners are not lost when merging the global and
local listeners.
Fixes #2897
Fixes #2899
2014-02-26 21:06:32 -05:00
ADmad
a0c399e374
Remove whitespace.
2014-02-26 10:40:53 +05:30
Saleh Souzanchi
9d4f3e92ab
fix issues #2897
2014-02-26 08:02:21 +03:30
mark_story
0f584c0e8b
Merge branch 'master' into 2.5
2014-02-24 21:19:17 -05:00
mark_story
0776b87214
Fix postLink() & postButton() with nested data.
...
Flatten deeply nested array data before generating hidden inputs.
This solves 'Array to string conversion' errors.
Closes #2894
2014-02-24 21:17:31 -05:00
Mark Story
e0e8f91d9e
Merge pull request #2866 from paddythenerd/master
...
Unsetting url both with & w/o this->base to allow proper handling when app n...
2014-02-24 20:27:25 -05:00
Mark Story
97ebfd6341
Merge pull request #2856 from cvandeplas/master
...
fixes issue #2855 where cafile is not set in HttpSocket
2014-02-21 22:29:35 -05:00
Patrick Barabe
08ba104543
Merge remote-tracking branch 'upstream/master'
2014-02-20 08:52:36 -07:00
Sam
62cb733988
One liner. Dont call function parseAccept() twice in RequestHandlerComponent.
2014-02-21 00:54:10 +11:00
mark_story
a80cbc205a
Simplify conditionals.
...
Set default values to remove else cases.
2014-02-19 21:46:53 -05:00
jalbertocr
8b2e1ab9e5
Don't do assignments inside conditionals.
2014-02-19 22:41:33 -03:00
jalbertocr
cdeb51167b
Fix types in docblocks.
2014-02-19 20:54:00 -03:00
jalbertocr
35f152b333
Make sure a datetime instance is valid to avoid fatal errors.
2014-02-19 20:50:30 -03:00
Patrick Barabe
a69aeb67c1
A better fix for issue #2711 . Allows url to be unset from request array regardless of this->base context
2014-02-19 13:37:01 -07:00
Patrick Barabe
a9d7792678
Unsetting url both with & w/o ->base to allow proper handling when app not hosted at server's DocumentRoot
2014-02-19 11:02:25 -07:00
AD7six
4e0627232c
account for localized floats more robustly.
...
Normalize floats, strings too, so that they are validated as
dddddddddd.dd
ref #2853
2014-02-19 15:04:25 +00:00
mark_story
b8c94fa5d4
Merge branch 'master' into 2.5
2014-02-18 22:19:12 -05:00
