Commit graph

16889 commits

Author SHA1 Message Date
euromark
97c148a170 Correct typo 2014-03-19 12:47:31 +01:00
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
Mark Story
23350eb89e Merge pull request #3051 from occitech/master
Themed CakeEmail should load view helpers with the theme set
2014-03-18 10:07:24 -04:00
Hadrien
d55a167830 Themed CakeEmail should load view helpers with the theme set 2014-03-18 14:22:24 +01:00
mark_story
d559e429e6 Merge branch 'http-response-code' into master.
Merge changes from #3016 into master.

Closes #3016
2014-03-17 13:09:03 -04: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
ndm2
0ae225615c Match SP as per rfc2821 2014-03-15 11:47:13 +01:00
Mark Story
100595b717 Merge pull request #3015 from cakephp/dbosource-bc-fix
2.5 - Dbosource bc fix
2014-03-14 14:28:21 -04:00
Wouter van Dongen
5035613157 * Fixed bug where select query in deleteAll could return wrong table name.
PDOStatement::getColumnMeta (in mysql.php) sometimes returns the actual
table name when using a MySQL view with the distinct select query, and not
the alias table name. By returning the actual table name the records
could not be removed.
By the way PDOStatement::getColumnMeta is an experimental function,
perhaps it's better to avoid it.
2014-03-14 15:20:12 +01:00
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
ndm2
c1824071c9 Expose last SMTP response. 2014-03-13 16:28:54 +01:00
ndm2
5326073c80 Refactor some code into overridable methods.
This should make the transport a little more extensibility friendly.
2014-03-13 16:06:43 +01: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
Lucas Freitas
4cd6ac2f15 Fix break of the CS on Travis 2014-03-13 00:24:16 -03: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 Oberemk
3f7eff1843 Update HtmlHelper.php
Updated documentation to include the chained $this return
2014-03-12 08:59:12 -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
b53c93031a Merge pull request #4 from Tounu/patch-5
Php cs fixed
2014-03-11 21:16:55 +01:00
Tounu
482b90e6b1 Php cs fixed 2014-03-11 21:16:30 +01:00
Tounu
91e52ff31a Merge pull request #3 from Tounu/patch-4
Creation of a method to parse fixture path
2014-03-11 20:56:57 +01:00
Tounu
e4c47f87dd Creation of a method to parse fixture path
Creation of `_parseFixturePath`
2014-03-11 20:55:46 +01:00
Tounu
9078f350bd Merge pull request #2 from Tounu/patch-3
Allow sub-directories for Fixture folder
2014-03-11 20:13:15 +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 Oberemk
8a8d2697d1 Allow chaining in the addCrumb method
For convenience I think it might be valuable to allow addCrumb (and possibly other similar functions) to return $this to permit chained calls such as this:

    $this->Html->addCrumb('Admin', '/admin')->addCrumb('Blogs', '/admin/users')->addCrumb('Add');

as opposed to the considerably more verbose version that needs to be used now:

    $this->Html->addCrumb('Admin', '/admin');
    $this->Html->addCrumb('Blogs', '/admin/users');
    $this->Html->addCrumb('Add');

I'm not sure if this violates some API conventions for helpers but it does seem rather more convenient to work with to me.
2014-03-11 10:37:47 -04: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
Mark Story
47900c10ca Merge pull request #2995 from tharlinsmith/ticket-2994
#2994, unnecessary calls to Model::__isset(null)
2014-03-10 15:53:17 -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
José Lorenzo Rodríguez
5b7c3d68f0 Merge pull request #2988 from kp2356/patch-1
Documentation correction
2014-03-10 10:10:36 +01:00
Kunal Panchal
a77a0f76a1 Documentation correction
TimeHelper::$niceFormat to CakeTime::$niceFormat
2014-03-10 14:05:03 +05:30
Mark Story
ff7061b09a Merge pull request #2971 from steinkel/feature/improve-set-docblock
fixing Set docblocks
2014-03-08 07:50:39 -05:00
Jorge González
4d51092259 fixing Set docblocks 2014-03-08 10:26:03 +00:00
Mark Story
3cfdf3cc31 Merge pull request #2967 from steinkel/feature/improve-set-docblock
improving docblock for Set::extract and Set::classicExtract return types
2014-03-07 17:21:04 -05:00
Jorge González
6049009cac improving docblock for Set::extract and Set::classicExtract return types 2014-03-07 19:33:02 +00:00