adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
16960 commits 7 branches 0 tags 44 MiB
Commit graph

6008 commits

Author SHA1 Message Date
euromark
5d4bb9c2e0 Make dispatch return CakeEvent - resolves #2819 2014-04-06 21:17:51 +02:00
José Lorenzo Rodríguez
8e3d6cffb7 Merge pull request #3002 from moberemk/patch-2 
Allow chaining in the addCrumb method
 2014-04-06 21:09:10 +02:00
mark_story
92800889a6 Update version number to 2.4.7 2014-04-04 22:25:48 -04:00
mark_story
7fb920c256 Add file missed in last commit. 2014-04-04 22:22:38 -04:00
mark_story
4ec81542db Fix email rendering when using 2 different plugins. 
When an email template and layout are in different plugins the incorrect
plugin would be used for the layout.

Fixes #3062
 2014-04-04 21:45:04 -04:00
mark_story
b8e21c99ee Only count _id if it is the last 3 characters in the field name. 
This prevents issues when baking models for tables containing `_id`.

Fixes #3230
 2014-04-04 21:26:31 -04:00
euromark
854a53b3cb generalize sentence 2014-04-04 19:19:10 +02:00
euromark
823909603a correct deprecation notices 2014-04-04 19:18:02 +02:00
Saleh Souzanchi
40b7694891 adding options for react to response when asset not exists 2014-04-04 19:50:37 +04:30
Ceeram
5c31641ea8 Change argument type to mixed in docblock, as debug() and pr() accept not just a single type 2014-04-02 23:53:54 +02:00
Joseph Woodruff
8536371501 Sqlserver Datasource how properly appends the schemaName prefix in the describe() method 2014-04-02 13:59:04 -06:00
Joseph Woodruff
d526fdadc1 Base model class no longer changes an already defined schemaName value 2014-04-02 13:58:29 -06:00
José Lorenzo Rodríguez
bf28e69501 Merge pull request #3197 from dereuromark/master-cs 
cs
 2014-04-02 08:32:26 +02:00
euromark
b150e33472 correct missed cs errors 2014-04-02 03:16:03 +02:00
euromark
e544340d67 fix indentation 2014-04-02 03:12:22 +02:00
euromark
bbe3b6a439 more cs 2014-04-02 03:09:42 +02:00
euromark
0d09a54033 more missing doc block tags added 2014-04-02 03:02:37 +02:00
euromark
44952b06a4 cs 2014-04-02 02:23:43 +02:00
Brian Porter
e5dd8acb60 Adds phpunit required version to TestShell "not found" error message. 2014-04-01 11:08:46 -05:00
Bryan Crowe
b93f373f16 Fix yoda condition in File test 2014-03-31 17:40:35 -04:00
mark_story
7419ac35b0 Merge branch '2.5' of github.com:cakephp/cakephp into 2.5 2014-03-30 21:25:19 -04:00
mark_story
f9b45f1b60 Merge branch 'master' into 2.5 2014-03-30 21:24:55 -04:00
Mark Story
11a5a0ae35 Merge pull request #3152 from ADmad/2.5-controller-invoking 
2.5 controller invoking
 2014-03-30 20:50:52 -04:00
ADmad
10f294d6bb Remove $reponse param of Dispatcher::_invoke(). 
Use controller's $response property by default.
 2014-03-30 19:29:07 +05:30
mark_story
d713ff2c6a Correct docblock. 
Refs #3147
 2014-03-29 20:19:34 -04:00
sam-at-github
dbbf6c6ad9 No array short syntax in 2.4\! 2014-03-29 22:40:58 +11:00
sam-at-github
863a8555d9 Fixed CS issues. Fixed bug - added missing condition to find. 2014-03-29 22:36:06 +11:00
sam-at-github
a3fe7cd245 on cake acl delete <> delete all matching records. Makes more sense than deleting one of possibly many. 2014-03-29 13:37:08 +11:00
Harold Putman
522b5048f8 Expose canUseMemory 
This lets Fixture be used to create an actual persistent table with InnoDB engine instead of MEMORY.
 2014-03-28 09:24:49 -04:00
sam-at-github
5ceb4abe1a Removed arbitrary restriction on crud operations. Added some comments to explain parameters to mapActions() better. 2014-03-28 13:35:08 +11:00
mark_story
6bf21c4a43 Update doc blocks to not be lies. 2014-03-27 11:55:54 -04:00
mark_story
c17cc39f08 Update version number to 2.5.0-beta 2014-03-25 21:31:38 -04:00
mark_story
381b3fc9c3 Merge branch 'master' into 2.5 2014-03-25 21:30:56 -04:00
mark_story
ff73229ab8 Fix failing tests. 
Not everyone uses the same database names as me.
 2014-03-24 10:04:19 -04:00
mark_story
2fe8c4050b Insert manual joins *after* generated joins. 
Re-order query joins to make manually added joins be performed after
generated joins. This removes the need to workaround the current join
order, or redefine all association joins when you want to add an
additional join on a leaf table.

Refs #2179
Refs #2346
 2014-03-23 21:09:08 -04:00
mark_story
de9a5a5845 Add deprecated flag to methods that are removed in 3.0. 
A few methods in Controller were not marked as deprecated, but already
removed in 3.0. Shore up that difference.

Refs #3105
 2014-03-23 20:40:17 -04:00
func0der
06f47ee01f Introduced I18n category constants (#1894) 
Replaced all hard coded category values
 2014-03-23 17:00:17 +01:00
mark_story
57b8008dbe Merge branch 'master' into 2.5 2014-03-23 11:01:13 -04:00
mark_story
75fcc7c2f8 Don't use count() in a loop. 
Use do while so the count does not happen in a loop statement. This
makes the code linter happier.
 2014-03-23 11:00:59 -04:00
Mark Story
dea6709d89 Merge pull request #3014 from ndm2/smtp-extensibility-response-access 
SMTP transport - Extensibility and response access
 2014-03-23 09:24:21 -04:00
Mark Story
90ca41d436 Merge pull request #2941 from lucasff/master 
Allow the passing parameter escape of the getCrumbList method
 2014-03-23 09:23:06 -04:00
mark_story
8acb75425d Merge branch 'master' into 2.5 
Conflicts:
	CONTRIBUTING.md
	lib/Cake/Model/Datasource/DboSource.php
 2014-03-21 22:55:28 -04:00
mark_story
a801be30d9 Use alternate quoting in assertTags() 
When a preg pattern contains no `.` it probably doesn't need quote
anchors.
 2014-03-21 22:53:25 -04:00
mark_story
f12b272758 Fix a few flaky/bad attribute matchers. 2014-03-21 22:52:52 -04:00
mark_story
af68f61e7a Make assertTags() run much faster. 
Generating the various permutations a priori is incredibly expensive
with sets of attributes. Using nested loops that look for matches is
more efficient.

Add replacments for `.*` and `.+` in preg:/ prefixed attribute matchers
so they do not greedily eat all content. This also requires that preg:/
based attribute matchers *must* be quoted.

Fixes #3072
 2014-03-21 22:52:52 -04:00
mark_story
c1b2b560bb Fix typo. 2014-03-21 22:52:52 -04:00
mark_story
a827b96804 Clean up doc blocks for assertTags. 2014-03-21 22:52:52 -04:00
James Watts
2eadb89ff6 Update in_array() check to avoid fatal error 
Enabling the $strict parameter to true avoids PHP's default behavior when search for an array in an array, which throws a fatal error if circular references exist - http://php.net/in_array#refsect1-function.in-array-parameters
 2014-03-21 16:16:32 +01:00
Mark Story
514974900f Merge pull request #3021 from wvdongen/master 
Fixed bug where select query in deleteAll could return wrong table name
 2014-03-21 08:21:24 -04:00
wbkostan
fea60bfe51 Update InflectorTest.php 
Added test cases for changes to inflector which affected words ending -aves. Author acknowledges the homonym conflict with 'leaves' and 'leaves', but preferences the word whose singular avoids an exception to the inflection rule.
 2014-03-19 19:17:52 -04:00
wbkostan
9a36ed5785 Update Inflector.php 
Modified singularizer inside inflector to accurately inflect most words ending in -aves. Removed irregular cases solved by this fix.
 2014-03-19 19:12:44 -04:00
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
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
ndm2
0ae225615c Match SP as per rfc2821 2014-03-15 11:47:13 +01: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
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 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
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
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
mark_story
0a51458ffd Fix Validation::decimal() not working with localized floats. 
Use similar workarounds as DboSource::value() for accepting localized
floats.

Fixes #2853
 2014-02-18 22:18:56 -05:00
Mark Story
3d00ca9643 Merge pull request #2861 from ujwaltrivedi/master 
Get unlimited number of slabs when clearing cache keys in memcache.
 2014-02-18 20:46:50 -05:00
Ujwal Trivedi
1045a5e0a5 Update MemcacheEngine.php 
removed 0 from getExtendedStats('slabs') in my last commit, someone point that out in the comment. Adding it back.
 2014-02-18 18:40:17 -05:00
Christophe Vandeplas
f018e4ff4d fixes issue #2855 where cafile is not set in HttpSocket 2014-02-18 09:39:56 +01:00
Mark Story
4353507ebb Merge pull request #2852 from ujwaltrivedi/master 
Update MemcacheEngine.php
 2014-02-17 16:44:13 -05:00
Ujwal Trivedi
cb0580a91a Update MemcacheEngine.php 
removing variable assignment
 2014-02-17 15:29:49 -05:00
mark_story
3433f4a1f0 Clean up changes code standards and tests. 
Refs #2582
 2014-02-17 11:03:49 -05:00
Jonas
b32deed4aa changed FormHelper::secure() and FormHelper::end() to support attributes in the hidden CSRF-protection tags that are being generated for SecurityComponent to allow specification of additional html attributes like HTML5s "form" attribute. This allows separation of Form instantiation/controls and form data - for instance within html tables 
improved tests for testing against additional attributes for Form::secure()

improved tests for testing against additional attributes for Form::end()

removed array cast, fixed test

fixed docblock format

format

Fixed a bug, this won't work as some forms are just empty
 2014-02-17 10:54:02 -05:00
mark_story
a965903777 Merge branch 'master' into 2.5 2014-02-17 10:51:32 -05:00
mark_story
070b165527 Mark compatibility shims as deprecated. 
Fixes #2845
 2014-02-17 10:29:03 -05:00
Mark Story
c325a93998 Merge pull request #2741 from ADmad/2.5-mimetype 
Added regex support to Validation::mimeType().
 2014-02-17 10:10:48 -05:00
Ujwal Trivedi
91ef655854 Update MemcacheEngine.php 
adding $limit=0 to clear function so it deletes all the keys for real
 2014-02-17 02:51:00 -05:00
ADmad
9ae7f11a2a Made mimetype check case insensitive. 2014-02-17 11:48:00 +05:30
mark_story
cde93ca7b9 2.x needs to be compatible with PHP<5.4 2014-02-16 21:37:28 -05:00
mark_story
3919f93149 Use simpler assertions. 2014-02-16 14:37:29 -05:00
mark_story
7a4cabe5d3 Add depth to log(). 
Much like dump() it is handy to be able to control the depth variables
are dumped out when logged.

Refs #2834
 2014-02-16 14:35:32 -05:00
mark_story
2c5d96e916 Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/Model/Datasource/DboSource.php
 2014-02-16 14:24:19 -05:00
José Lorenzo Rodríguez
4f424007fa Merge pull request #2822 from dereuromark/master-validation 
Fix uploadError validation rule
 2014-02-13 19:58:40 +01:00
AD7six
5334fe04c3 handle loose % signs in __() function 
While it's passed to sprintf and translation markers may contain
variable placeholders (%s, %d) that doesn't mean translators need to be
aware of all relevant rules. A % sign in a translation message shouldn't
cause a warning (and no return) it should be handled as a literal
percent sign.
 2014-02-13 15:30:16 +00:00
ADmad
54a395cc3e Updated docblock. 
BlowfishAuthenticate is deprecated.
 2014-02-13 17:54:53 +05:30
euromark
1725386c16 Fix uploadError validation rule to work with OS Win. Here the error is string, not integer. 2014-02-12 21:52:18 +01:00
mark_story
827dc77a11 Fix incorrect assertion. 2014-02-11 22:00:24 -05:00
mark_story
96a37d5917 Fix temporary associations that replace fields not being restored. 
When binding temporary associations, fields should be restored
in the afterFind as the association will have become unbound.

Fixes #2816
 2014-02-11 21:56:05 -05:00
mark_story
a5d50da040 Remove dead and unused code. 2014-02-11 16:38:24 -05:00
ADmad
9de3418079 Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/Model/Permission.php
 2014-02-11 18:17:59 +05:30
ADmad
d838e7b56f Updated upgrade shell to change CakeRequest::onlyAllow() usages. 2014-02-10 18:18:09 +05:30
ADmad
1da79080ac Updated bake templates to use CakeRequest::allowMethod() 2014-02-10 17:56:57 +05:30
ADmad
bea30e62cb Renamed CakeRequest::onlyAllow() to CakeRequest::allowMethod(). 
Existing name is unintuitive and it's not easily apparent what
the method does. Closes #2803
 2014-02-10 17:38:55 +05:30
Mark Story
7a72431442 Merge pull request #2770 from ukk1337/master 
Added missing 'Session'-Component in bake
 2014-02-09 16:04:25 -05:00
mark_story
91349c306e Remove trailing whitespace. 
Refs #2799
 2014-02-09 16:03:37 -05:00
Mark Story
6b3a062927 Merge pull request #2799 from sam-at-github/master 
Fixed prefixed action prefix reverse routing match. One liner.
 2014-02-09 16:02:44 -05:00
Sam
f3cd0fc808 Test added for previous fix in CakeRoute.php. Refs #2797. 2014-02-10 02:20:00 +11:00
Sam
a9059d4a4f Fix formatting - one space too much. Refs #2799. 2014-02-10 02:02:41 +11:00
Sam
7fd13d406c Fixed prefixed action prefix reverse routing match. One liner. 2014-02-10 01:38:32 +11:00
Eric Martins
2793dca671 Fix ApiGen errors 2014-02-07 18:29:54 -02:00
Sam
9691e54248 Minor comments only. Added more explanation of $defaults parameter to Router::connect(). Trying to clarify how it relates to the routing destination and the template string tokens. 2014-02-06 20:34:02 +11:00
Sam
ae3c791b6c Minor documentation corrections about Router::connect(). 2014-02-06 18:41:37 +11:00
Mark Story
278349aff9 Merge pull request #2782 from jimmymadon/feature-clarify-acl-errors 
Clarified ACL node lookup failed error.
 2014-02-05 17:55:11 -05:00
ADmad
d9489257d3 Don't return true from view classes' render() method. 
It cause's Controller:render() to set the response body as `true`.

Refs #2780
 2014-02-06 03:06:00 +05:30
Jimmy Madon
fcd41e45a7 Clarified ACL node lookup failed error. 
Original error was ambiguous in stating whether the ARO node lookup failed or the ACO node lookup failed.
 2014-02-05 18:25:14 +00:00
David Steinsland
f2b9aa5ca4 Fixed HTTP Status code when ajaxLogin is set 2014-02-05 16:05:02 +01:00
mark_story
be8ebfc005 Merge branch 'master' into 2.5 2014-02-05 09:22:46 -05:00
mark_story
919cb7d90e Fix bake templates to generate functioning code. 
Closes #2776
 2014-02-05 09:21:49 -05:00
ukk1337
3cd6bb39bd fixed coding standard errors 2014-02-04 15:37:23 +01:00
ukk1337
60c289fd68 removed indentation 2014-02-04 13:47:50 +01:00
ukk1337
9670a5af88 Added missing 'Session'-Compomnent in bake 
If a Controller was baked interactively and one want to use Session flash messages, the required 'Session'-Component wasn't added to the $components-Array
 2014-02-04 13:35:48 +01:00
AD7six
adc0bf3ded BC fix for checkbox ids 
Revert to previous behavior for id generation of checkboxes, This commit
can be reverted for 2.5+ is desired

Fixes #2733
 2014-02-03 17:57:26 +00:00
mark_story
ecf5aec1ae Add '@' to the list of characters removed from radio/checkbox ID. 
This character can easily show up in email addresses and can cause
invalid HTML.

Refs #2733
 2014-02-02 21:20:31 -05:00
José Lorenzo Rodríguez
e36c954da7 Merge pull request #2693 from ADmad/2.5-session-start 
Don't start a session if it's known to be empty.
 2014-02-01 04:08:48 -08:00
Mark Story
a6459a6c2f Merge pull request #2740 from rchavik/2.5-event-manager-regression 
RFC Fix: CakeEventManager regression
 2014-01-31 07:10:46 -08:00
Mark Story
405f3a1cb9 Merge pull request #2752 from rchavik/2.4-postgres-alterschema 
Fix: Changing boolean to integer for Postgres
 2014-01-31 06:46:52 -08:00
Rachman Chavik
9f978e9bf7 Check event against listeners registered in local and global manager 
Closes #2730
 2014-01-31 16:52:29 +07:00
Rachman Chavik
35c22a291e Add test to prove Event Manager regression 2014-01-31 16:52:26 +07:00
Rachman Chavik
59549b7ebe Fix: Changing boolean to integer for Postgres 
Closes #2751, CakeDC/migrations#149
 2014-01-31 15:14:20 +07:00
mark_story
4d57d3ce5b Fix plugin path filtering when directories do not exist. 
When paths do not exist we should correctly remove them from the output
paths.

Fixes #2748
 2014-01-30 21:40:08 -05:00
mark_story
605351d0c9 Allow empty values in checkboxes. 
Allow the checkbox value attribute to be empty. This is required to make
checkboxes with a value of 0.

Fixes #2717
 2014-01-30 21:12:06 -05:00
Walter Nasich
a7f50e0ce7 Using sprintf to convert number into non-scientific notation 2014-01-30 19:07:23 -03:00
Walter Nasich
43604f64d5 Rendering a proper value for html5 attribute 'step' 2014-01-30 17:17:50 -03:00
Matt Alexander
dedefee87e Fix link in comment 2014-01-30 10:07:45 -06:00
ADmad
2d10707d18 Added regex support to Validation::mimeType(). 2014-01-30 21:05:04 +05:30
mark_story
c1ab6fa9d1 Merge branch 'master' into 2.5 2014-01-30 10:13:37 -05:00
Walker Hamilton
df2fc07940 Grammatical fix in API docs only 
Grammatical fix in API docs only

reset
 2014-01-29 11:51:29 -06:00
Mark Story
6eb5a38f22 Merge pull request #2692 from jrbasso/2.5-cors 
Added support to cross origin requests
 2014-01-29 06:45:11 -08:00
Mark Story
8db034cbf1 Merge pull request #2731 from joostdekeijzer/console-extract-not-handling-validation-quotes 
Console Extract task doesn't handle validation messages with qoutes correctly
 2014-01-29 06:43:23 -08:00
Mark Story
5629dfdcc3 Merge pull request #2728 from joostdekeijzer/2721-fix-in-translatebehavior 
Fix Model::field() and  TranslateBehavior::beforeFind() not working together.

Fixes #2721
 2014-01-29 06:40:27 -08:00
joostdekeijzer
42daa25340 Fix Console "extract i18n from sources" to handle quotes in Model::validate parameters correctly 2014-01-29 14:53:52 +01:00
joostdekeijzer
987187ef8c Fix #2721 in TranslateBehavior::beforeFind() supporting both Model::field('fieldname') and Model::read('fieldname') 2014-01-29 13:37:47 +01:00
joostdekeijzer
827c815cf1 correct property comment 2014-01-29 12:25:09 +01:00
Rachman Chavik
b83b59a9d7 Log errors instead of calling trigger_error() 2014-01-29 17:51:07 +07:00
mark_story
9b4c2f3c86 Update version number to 2.4.5 2014-01-26 15:06:00 -05:00
ADmad
c093804b35 Merge branch 'master' into 2.5 2014-01-26 17:39:50 +05:30