mark_story
afc8587949
Merge branch 'master' into 2.5
2014-03-18 22:12:14 -04:00
mark_story
ee895a8bb1
Add form attribute to hidden inputs when present.
...
If inputs are placed outside of the form elements the form attribute
needs to be set on the hidden inputs. Without this attribute the empty
state does not submit correctly.
Fixes #3053
2014-03-18 22:11:57 -04:00
Hadrien
d55a167830
Themed CakeEmail should load view helpers with the theme set
2014-03-18 14:22:24 +01:00
mark_story
9888209e9a
Add tests and fix issues with multiple trailing whitespaces.
...
Closes #3016
2014-03-17 13:08:46 -04:00
Mark Story
9534d0d1e7
Merge pull request #3027 from ADmad/2.5-requesthandler-ext
...
Remove setting of Controller::$ext by RequestHandler.
2014-03-16 11:36:58 -04:00
ADmad
961f9d7669
Merge branch 'master' into 2.5
2014-03-16 20:17:24 +05:30
ADmad
abacf0d14b
Remove setting of Controller::$ext by RequestHandler.
...
Closes #3022
2014-03-16 20:09:08 +05:30
samokspv
9e15042eff
changed regexp for response code
...
Facebook servers have now HTTP response without status string. The use
"HTTP/1.1 200 "
while CakePHP needs
"HTTP/1.1 200 Ok"
because preg_match() in code use + instead *
2014-03-13 19:11:14 +02:00
mark_story
7b2ac816c6
Retain the original file name so errors can be generated properly.
...
We should hold onto the original file so we can generate a error message
when the file is not found.
Fixes #2990
Closes #3011
2014-03-13 12:29:16 -04:00
mark_story
3a226b03c3
Remove typehint from generateAssociationQuery()
...
While I think typehints are generally a good idea, this one broke a few
plugins, notably CakeDC/search. I don't think it is wise for 2.X release
to break BC in that way. I think reverting this change is probably the
safest path right now.
2014-03-12 23:42:21 -04:00
mark_story
5a944734b8
Remove typehint on $LinkModel argument.
...
Adding a typehint here causes errors in a few userland plugins. We
should honor the previous interface as best we can.
2014-03-12 23:30:46 -04:00
Mark Story
0d4a6e358e
Merge pull request #3005 from Tounu/2.5
...
Allow sub-directories in Fixture folder
2014-03-12 09:15:49 -04:00
Mark Story
fda242f000
Merge pull request #2961 from ovidiupruteanu/patch-3
...
Sqlserver->describe failing for models with a schemaName
2014-03-11 21:03:54 -04:00
mark_story
c5b6dda82f
Merge branch 'master' into 2.5
2014-03-11 21:02:27 -04:00
Tounu
482b90e6b1
Php cs fixed
2014-03-11 21:16:30 +01:00
Tounu
e4c47f87dd
Creation of a method to parse fixture path
...
Creation of `_parseFixturePath`
2014-03-11 20:55:46 +01:00
Tounu
316fd50443
Allow sub-directories for Fixture folder
...
Allow sub-directories for Test/Fixture folder (for app. and plugin.)
The directory separator is '/'.
A file ``MyClassFixture.php` in the folder `Fixture/MyFolder` will be included like this :
`'app.MyFolder/my_class'`
2014-03-11 20:12:52 +01:00
mark_story
c0ac61117e
Only sort the keys once per request instead of on each match.
...
Sorting the keys property by value sorts keys with the same prefix for
free. This does change the order of the keys, but I don't think that is
actually a large issue as it is just a list.
Refs #2991
2014-03-10 21:42:26 -04:00
Mark Story
0c207dba4b
Merge pull request #2991 from mikegibson/route_params
...
Fixed incorrect replacement of route elements beginning with same string
2014-03-10 21:28:38 -04:00
Mike Gibson
0de1307110
Changed if statement to force Travis rebuild
2014-03-10 18:46:28 +00:00
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
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
