17173 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brian Porter	9b9600fe18	CakeSchema naming fallback. ... Abstracts the `require_once` of the schema file so it can be done twice. The added second call is a fallback for the previous APP_DIR-based naming to provide backwards compatibility. Removes now-obsolete CakeSchema tests that involved `Configure::read('App.dir')`. The CakeSchema::name is now always static (and predictable) in the default case.	2014-08-11 10:40:57 -05:00
Brian Porter	543e520ccb	Corrects logic to only apply default filename in **all** cases where none provided.	2014-08-11 10:34:30 -05:00
Brian Porter	6358208e32	Figures it'd be a missing paren.	2014-08-11 09:23:56 -05:00
Brian Porter	be9be48c46	More predictable default for CakeShema class naming. ... Instead of using the `APP_DIR` constant, which may change between developer installations of a project and cause issues loading Schemas generated elsewhere, use a fixed string, 'App'. This is related to CakeDC/migrations#184 and should fully resolve #4174.	2014-08-11 09:12:16 -05:00
Brian Porter	f93029b29f	SchemaShell always uses --file param when present. ... Addresses **part** of the problem described in #4174. Corrects SchemaShell's startup logic so that when a `--file` param is provided by the user, it is always used even in the case that it matches the default file name (schema.php). This solves a problem when a user wishes to provide a classname using `--name`, but still wants to use the default filename.	2014-08-11 09:08:59 -05:00
Mark Story	ffefa6425f	Merge pull request #4225 from ravage84/php7-uniform-variable-syntax ... Be forward compatible to PHP 7's "Uniform Variable Syntax"	2014-08-10 22:25:12 -04:00
Marc Würth	120bd37ffa	Be forward compatible to PHP 7's "Uniform Variable Syntax" ... https://wiki.php.net/rfc/uniform_variable_syntax	2014-08-11 01:33:25 +02:00
mark_story	d114fa1431	Update join building to not error out on empty conditions. ... When conditions are empty we can assume one of two things: * The person made a mistake. * The person is doing the join conditions in the where clause. In both cases we should attempt to generate proper SQL. Fixes #4189	2014-08-08 10:02:09 -04:00
Mark Story	7c8770d577	Merge pull request #4183 from ravage84/patch-1 ... Added links to book	2014-08-06 20:23:05 -04:00
Marc Würth	49bdde88d2	Added links to book	2014-08-07 01:56:53 +02:00
Mark Story	53447fe2fb	Merge pull request #4182 from dereuromark/master-cookie ... Fix cookie reading.	2014-08-06 17:38:59 -04:00
euromark	5f5218f3b2	Fix cookie reading.	2014-08-06 22:53:54 +02:00
Mark Story	dda4933ed0	Merge pull request #4180 from dereuromark/master-readme ... Make readme more shiney and informative.	2014-08-06 13:06:37 -04:00
Mark S.	2471c64aae	Merge pull request #4158 from dereuromark/master-cakesession-hotfix ... Fix notice in CakeSession.	2014-08-06 18:25:55 +02:00
euromark	60603cd9be	Make readme more shiney and informative.	2014-08-06 17:53:31 +02:00
José Lorenzo Rodríguez	64e74cbaac	Merge pull request #4175 from chinpei215/master-issue2268-fix ... Fix afterFind() called twice with belongsTo and hasOne relationships	2014-08-06 10:48:45 +02:00
Mark Story	221fc862aa	Merge pull request #4140 from chinpei215/master-issue2849-fix ... Fix transactions do not get rollbacked in saveAssociated/saveMany. Fixes #2849	2014-08-05 20:05:15 -04:00
chinpei215	1fe943d6f1	Fix afterFind() called twice with belongsTo and hasOne relationships ... Refs #2268	2014-08-06 07:27:04 +09:00
ADmad	fa2cba6dff	Merge pull request #4169 from thinkingmedia/patch-1 ... Added missing return statement.	2014-08-05 18:26:12 +05:30
Mathew Foscarini	4957418a4b	Added missing return statement. ... PhpStorm is flagging this function as missing a return statement. Using a return statement (instead of the default) makes the intent of the source code clearer.	2014-08-05 08:39:19 -04:00
Mark Story	214d278119	Merge pull request #4161 from dereuromark/master-cs-equals ... CS fixes.	2014-08-04 10:06:41 -04:00
euromark	9ef7b5713a	CS fixes.	2014-08-04 13:53:52 +02:00
euromark	864f5e06f6	Fix notice in CakeSession.	2014-08-04 13:32:20 +02:00
mark_story	4e168ca004	Fix incorrect docs.	2014-08-03 20:36:31 -04:00
chinpei215	cb376bf420	Add some more transaction tests ... And remove 2 else clauses.	2014-08-03 22:34:11 +09:00
Mark Story	2359e89c78	Merge pull request #4150 from ADmad/2.5-cachehelper-exception ... Throw exception instead of logging in debug mode when view cache fails.	2014-08-02 18:45:48 -04:00
ADmad	c193ce708a	Throw exception instead of logging in debug mode.	2014-08-03 03:16:39 +05:30
chinpei215	799500ce6d	Fix transactions do not get rollbacked in saveAssociated/saveMany ... Refs #2849	2014-08-02 10:12:33 +09:00
chinpei215	3d77ce5d34	Fix serveral tests pass regardless of whether data is valid or not	2014-08-02 09:55:29 +09:00
ADmad	8e40fcf5ef	Merge pull request #4131 from williamn/master ... Update HtmlHelper.php	2014-08-01 10:39:47 +05:30
William Notowidagdo	23954e6ad3	Update HtmlHelper.php ... No need to add `null` to `$options` param as mentioned in the docs section: [Using blocks for script and CSS files](http://book.cakephp.org/2.0/en/views.html#using-blocks-for-script-and-css-files)	2014-08-01 11:22:29 +07:00
Mark Story	a6caf28ea6	Merge pull request #4122 from chinpei215/master-scaffold-error-fix ... Fix a fatal error occurs in combination with a scaffold error.	2014-07-31 10:44:33 -04:00
ADmad	896065d718	Merge pull request #4117 from antograssiot/master ... master - `a` / `an` typo fixes for API	2014-07-31 09:31:14 +05:30
chinpei215	f3e1a18740	Fix a fatal error occurs in combination with a scaffold error.	2014-07-31 05:49:23 +09:00
Anthony GRASSIOT	aa42b80a4d	a / an typo fixes fot API	2014-07-30 22:11:03 +02:00
mark_story	4bee5b4b86	Fix RequestHandlerComponent not unserializing JSON on DELETE requests. ... Fixes #4108	2014-07-29 21:54:03 -04:00
mark_story	f9785042bc	Fix indentation. ... Refs #4108	2014-07-29 21:53:55 -04:00
Steve Tauber	e6f6ded334	Adding unit test for HTTP DELETE and RequestHandlerComponent::requestedWith	2014-07-29 16:34:11 +02:00
Steve Tauber	0af698c591	Updating RequestHandlerComponent to accept body of HTTP Delete requests	2014-07-29 16:08:33 +02:00
José Lorenzo Rodríguez	ec28108325	Merge pull request #4087 from dereuromark/master-validation-year ... Make year range validation less strict by default.	2014-07-29 10:23:48 +02:00
euromark	b188d670b7	Make year range validation less strict by default.	2014-07-26 04:06:26 +02:00
Mark Story	d6733e3ad1	Merge pull request #4078 from dereuromark/master-bake ... Fix project baking	2014-07-24 13:13:08 -04:00
euromark	99d6932ecc	Fix project baking	2014-07-24 18:43:48 +02:00
Mark Story	adf739b893	Merge pull request #4011 from ndm2/stmp-auth-reponse-evaluation-fix ... Make SMTP auth reply code checks work properly.	2014-07-24 08:42:22 -04:00
José Lorenzo Rodríguez	94b9bf807b	Merge pull request #4076 from rchavik/2.5-space-in-url ... Fix: Blackholed request when POSTing to a URL with space	2014-07-24 12:53:04 +02:00
Rachman Chavik	aad89444d1	Fix: Blackholed request when POSTing to a URL with space ... Eg: Actual Posted URL: /admin/settings/settings/prefix/Access%20Control $_GET value: /admin/settings/settings/prefix/Access_Control Since $unsetUrl differs, the $_GET value will get copied in to CakeRequest::$query, causing CakeRequest::here() to return: /admin/settings/settings/prefix/Access%20Control?%2Fadmin%2Fsettings%2Fsettings%2Fprefix%2FAccess_Control= This confuses SecurityComponent in the following line: f23d811ff5/lib/Cake/Controller/Component/SecurityComponent.php (L514)	2014-07-24 16:25:03 +07:00
Mark Story	d0a22ade39	Merge pull request #4044 from ravage84/patch-1 ... Added NetBeans project folder to .gitignore	2014-07-23 21:37:58 -04:00
mark_story	08de917b3c	Fix accidental typo in SQL file. ... Fixes #4061	2014-07-22 09:38:46 -04:00
ADmad	80ba96cef6	Merge pull request #4060 from davidsteinsland/fix_ajax_login_header ... Fixed sending of headers when ajaxLogin is set	2014-07-22 19:01:51 +05:30
David Steinsland	6e777a54a3	Mocking _sendHeader instead of send()	2014-07-22 15:05:06 +02:00