Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

2.1 #451

Closed
wants to merge 478 commits into from

26 participants

Christopher Vrooman ADmad Mark Story ceeram Tigran Gabrielyan Andy Dawson Renan Gonçalves Kyle Robinson Young José Lorenzo Rodríguez Veselin Todorov Ivan Majnaric Simon Males Victor Yap Hans-Joachim Michl Matthew Lanigan Jose Diaz-Gonzalez Miguel Angel Bob Fanger Scott Harwell Cauan Cabral Stefano Zoffoli Walter Nasich Matt Potts Yusuke Ando and others
Christopher Vrooman

No description provided.

markstory and others added some commits
Mark Story markstory Fix issue with scripts_for_layout compatibility. 9cdf804
Tigran Gabrielyan tigrang Changed order of controller var merging
From AppController -> PluginAppController to
PluginAppConroller -> AppController

Fixes #2420

Signed-off-by: mark_story <mark@mark-story.com>
015f995
Mark Story markstory Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
23178df
Mark Story markstory Fix version config. ff29b19
Mark Story markstory Fix string offset error in PHP 5.4 ed43c68
Mark Story markstory Merge pull request #387 from shama/patch-text-truncate
Prevent TextHelper::truncate() from breaking HTML
a4e3790
Mark Story markstory Merge branch '2.0' into 2.1 3478f8a
Mark Story markstory Fix issue with rendering elements inside blocks.
Fixes exceptions being raised when you tried to render
elements inside blocks.  Instead compare the number of open blocks.
This should not change before/after rendering a view.
6c902a1
Mark Story markstory Adding docs + exceptions for name translation.
Closes #2367
b5f9187
Mark Story markstory Should have been association name, not field name. c3e9a93
Kyle Robinson Young shama Fix types in docblocks in App class 8b9770d
José Lorenzo Rodríguez lorenzo Merge pull request #390 from shama/patch-app-doc-type
Fix types in docblocks in App class
c90aafb
Mark Story markstory Add Windows Phone OS to mobile browser list.
Fixes #2428
ac408b3
Mark Story markstory Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Network/CakeRequest.php
83987be
Mark Story markstory I'm an idiot. Fix the parse error. 997aa8a
Veselin Todorov vesln Adding resourceMap accessor 8864805
Veselin Todorov vesln Adding resourceMap accessor test 3eea2e2
Mark Story markstory Merge pull request #392 from vesln/resource-map
Resource map
81d7ef4
Mark Story markstory Adding error to find(threaded).
When the model has no parent_id trigger a warning about the impending
failure and return an empty result.

Fixes #2341
b4faa00
ceeram

Wouldn it be better to check for parent_id in schema in the before part, instead of doing this check within the foreach loop of results?

Collaborator

Would be nice if you could also define the parent field.
There is a chance to do it automatically, by checking belongsTo relationships using the same model, but its not 100%.

Having a parent_field key would solve it, eg:

$thread = $Apple->find('threaded', array('parent_field' => 'thread_id'));
Collaborator

I believe there's already an enhancement ticket to allow specifying the parent field, so this is a good idea.

Owner

I think being able to provide a custom parent_id field makes sense, we should still trigger an error if someone asks for a field that doesn't exist. As for the isset() in the loop, it could probably be moved out and done once for sure. I don't know why I didn't think of that earlier.

Collaborator

Why don't we move this logic to a new function that isn't burried in an "after" find method. E.g. Set::thread ?

Collaborator

@markstory as pointed out by @AD7six in irc, the isset() is needed within the loop for schemaless dbs not returning the key if no value is present.
So i think we can leave that as it was.

markstory and others added some commits
Mark Story markstory Return 0 if there is no result.
The documented return is an integer.  Stick to that.
Fixes #2430
101148c
Mark Story markstory Fix null bytea columns.
Apply patch from 'opiazer'  Fixes #2432
c43b099
Mark Story markstory Remove duplicate methods.
Fix regression where #1345 was re-introduced.
Fixes #2434
3e1c567
Mark Story markstory Merge branch '2.0' into 2.1 9562638
Ivan Majnaric majna Fix incorrect doc block in CakeSession. ba02cf7
José Lorenzo Rodríguez lorenzo Merge pull request #393 from majna/2.0-sess-doc
Fix incorrect doc block in CakeSession.
3589eae
Ivan Majnaric majna Remove unused property CakeSession::$security. 75b4e7d
José Lorenzo Rodríguez lorenzo Merge pull request #394 from majna/2.0-sess-doc
Remove unused property CakeSession::$security.
f9c8d0c
Mark Story markstory Changing SCRIPT_NAME to PHP_SELF
Several shared hosts have issues with SCRIPT_NAME having an incorrect value.
Revert back to using PHP_SELF like in 1.3.

Fixes #2437
Fixes #2334
Fixes #2268
95ec741
Simon Males sime schema update fails with -f flag, although it's supported. adc6846
Renan Gonçalves renan Merge pull request #395 from sime/2.0
schema update fails on -f flag
edf37e7
Ivan Majnaric majna Fix dispatching event when event key name is used. 8ad989c
Renan Gonçalves renan Merge pull request #396 from majna/2.1-event
2.1 event
5690d42
José Lorenzo Rodríguez lorenzo Removing 1.3 Backwards compatible code to load underscored files. Now…
… you can App::build('Locale') instead of 'locales'
00a0c60
José Lorenzo Rodríguez lorenzo Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 7c0297a
Mark Story markstory Fix singularization of 'foes'
Fixes #2424
e649a05
Mark Story markstory Add skip for test that fails on SQLServer.
SQLServer doesn't support LIMIT, skip the test as its tested
in Jenkins all the time.
f22c80e
Mark Story markstory Fix failing tests with SQLServer. d69c3f3
Mark Story markstory Fix failing test on windows
File permissions do not work the same on windows, skip the test.
f23226b
Mark Story markstory Merge branch '2.0' into 2.1 15c7493
Mark Story markstory Add missing else for non SQLServer db's. 9a7e69d
Mark Story markstory Merge branch '2.0' into 2.1 de7921a
José Lorenzo Rodríguez lorenzo Fixing a couple failing tests on windows using sqlserver cd562f5
José Lorenzo Rodríguez lorenzo Explicitly using a fetch mode in SQLServer, not doing it causes serio…
…us memory leaks
ba097d4
José Lorenzo Rodríguez lorenzo Fixing windows failing test case on the debug function abb370f
José Lorenzo Rodríguez lorenzo Fixing a few SqlServer failing tests 0c6271d
José Lorenzo Rodríguez lorenzo Removing test that does not relate anymore to SqlServer datasource 1991430
Mark Story markstory Update Configure::load() to use Set::merge()
This fixes some of the awkward behavior that using
array_merge_recursive() could create.

Fixes #2441
8792441
Mark Story markstory Fix illegal offset caused by TranslateBehavior.
If you load TranslateBehavior at runtime in a disabled state, the enabled
flag would be interpreted as an association and cause errors.

Fixes #2443
beced84
José Lorenzo Rodríguez lorenzo Ensuring the javascript provider class is loaded before checking meth…
…od on it
fa99b58
José Lorenzo Rodríguez lorenzo Using an explicit fetch mode in all calls to PDOStatement::fetch, thi…
…s also reduces the memory usage
e5c312f
José Lorenzo Rodríguez lorenzo Extracting the CakeSessionHandlerInterface into its own file 399c293
José Lorenzo Rodríguez lorenzo Initializing CakeSession class only when required, mixing procedural …
…code with class definitions is not good
7b58636
José Lorenzo Rodríguez lorenzo Making sure the Validation class exists before checking methods on it 67d18b0
José Lorenzo Rodríguez lorenzo Adding a replacement for zend_thread_id() to use within hiphop 44dd250
José Lorenzo Rodríguez lorenzo Wrapping highlight_string into a helper function as hphp does not imp…
…lemnet this function
8b7f069
Mark Story markstory Add dist/ and build/ to gitignore. 6c35469
Mark Story markstory Adding phing build.xml 864cb39
Mark Story markstory Add next-version task. 41bbc02
Mark Story markstory Update version number to 2.1.0-alpha 6361500
Mark Story markstory Adding task to cut a release tag and push it. ce80a78
Mark Story markstory Add distribute task.
Once the pear channel is setup, this will publish tar
files to the pear channel.
393bc7f
Mark Story markstory Revert version number change.
Add trim to fix cli display.
da5d4bb
Mark Story markstory Update core cake.php to match other versions.
This makes the pear package install play nice as well.
72b9eb5
Mark Story markstory Remove un-used property. 65a6fae
Mark Story markstory Add help and docs. baaa2e6
Mark Story markstory Update build definition. af5fe31
Mark Story markstory distribute target works ca99ebf
Mark Story markstory Add other core members. 2aa6822
Mark Story markstory Fix a few problems with the build.xml
- Fix condition checking. Phing was barfing on the old 'code'
- Packages would always be made for the previous release.  Fix that.
- Check return codes so we don't blunder ahead when things go wrong.
- Put in invalid data so accidents don't happen.
1644b1c
Mark Story markstory Add more verbose output to the various commands. 90423dc
Mark Story markstory Remove incorrect constant. 79564fb
Mark Story markstory Fix failing test. 9a67a70
José Lorenzo Rodríguez lorenzo More explicit fetch mode in Mysql datasource 850dbb9
José Lorenzo Rodríguez lorenzo Merge branch '2.1-hiphop' into 2.1 c029316
Mark Story markstory Fix issue with find(count) and translated conditions.
Because count queries did not have joins created for the translated
fields pagination would generate invalid queries. Checking the conditions
for translated fields and adding in the correct joins solves that.
Extract what would have been duplicated code into methods.

Add a few protected properties to keep method signatures sane. The code
could be even simpler if the existing find(count) join was removed.

Fixes #2349
c548b6b
Mark Story markstory Fix error with more case-sensitive databases. 3c48552
Mark Story markstory Fix errors generated when option['order'] is undefined.
Fixes #2447
f4c27e0
Mark Story markstory Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/BehaviorCollection.php
	lib/Cake/basics.php
0e56d74
Mark Story markstory Fix failing test in App. 1bc4562
Mark Story markstory Update version number to 2.1.0-alpha 1ffde95
ADmad ADmad Refactoring I18n class to expose public methods to read .po, .mo and …
…locale definition files.
1f246d6
ADmad ADmad Replacing hardcoded default domain with static property I18n::$defaul…
…tDomain
08825e5
ADmad ADmad Adding $language parameter to I18n::translate() 30522d0
ADmad ADmad Adding / updating I18n class test cases. 0be71a0
Andy Dawson AD7six Ensure the class has a constructor
if there is no constructor (this means a model which does not inherit
from Model) newInstance will throw an exception.
336c750
Andy Dawson AD7six Ensure the class has a constructor
if there is no constructor (this means a model which does not inherit
from Model) newInstance will throw an exception.

Conflicts:

	lib/Cake/Utility/ClassRegistry.php
b8598c5
Andy Dawson AD7six move find threaded logic to the set class 7b640b8
Andy Dawson AD7six move the paths used into options 442d889
Andy Dawson AD7six allow set nest to work with any-d arrays
not just model-formatted arrays
5608d63
Mark Story markstory Add iPad to the list of mobile clients.
Fixes #2452
dbea156
Mark Story markstory Fix incorrect `__isset()`.
There was a missing $ before name.  Fixes issues
with dynamic properties not being handled correctly.

Fixes #2450
d238d8c
Andy Dawson AD7six reduce code repetition d534013
Andy Dawson AD7six add tests for set nest method 3b1dd82
Andy Dawson AD7six add a test for what happens when you nest on a field that doesn't exist d5fdf45
Andy Dawson AD7six whitespace a62c535
Andy Dawson AD7six documentation clarification 941d503
Mark Story markstory Move check out of the loop, and allow nulls.
Refs #2341
a8bc916
Mark Story markstory Make allow(null) and deny(null) consistent with no args.
No arguments and a single null should be handled the same.

Fixes #2461
7877e7f
Mark Story markstory Add additional empty() for tablePrefix.
Fixes compatibility issues with plugins that worked correctly in
previous point releases.

Fixes #2462
aeda986
Mark Story markstory Replace smart quotes with ASCII equivalents.
Fixes #2466
32cb416
Victor Yap starlocke Return length 36 for uuid columns in Postgres.describe()
When describing a Postgres native "uuid" column, the length 36 should be
returned so that Model.save() will be able to correctly set $isUUID as
"true" on that column.

Fixes #2467
cf8c1cd
José Lorenzo Rodríguez lorenzo Merge pull request #401 from starlocke/2.0-2467
2.0 2467
c168677
Mark Story markstory Ensure helpers are loaded in data views.
Both XmlView and JsonView should load helpers when
they use view files.

Fixes #2465
0f8e150
Hans-Joachim Michl hmic Fixed wrong boundary marker for inline-files, inline-files should sta…
…rt new rel-boundaries, not (outer-)mixed-boundaries.

Amavis spits out this error:
X-Amavis-Alert: BAD HEADER MIME error: error: unexpected end of parts before epilogue
29cfdb4
Mark Story markstory Fix boundaries used in multi-part messages.
Inline attachments should use the multipart/related boundary.  Otherwise
sections will be incorrectly nested.

Fixes #2413
4d73f4e
José Lorenzo Rodríguez lorenzo Explicitly casting to string a variable that could in times be either…
… string or integer
c53f0e6
José Lorenzo Rodríguez lorenzo Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 1a741b8
Mark Story markstory Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Utility/ClassRegistry.php
97ce118
Matthew Lanigan rintaun $action in AclShell::_getParams() defaults to '*', not NULL 0e607bf
Andy Dawson AD7six rename set::getValue to set::get - and make it public 7414d0f
ceeram

oops, my dumb mistake. however this only works for properties not needing magic __get()

doing:

$this->request->params['action'] = 'index';
isset ($this->action) will return false

now DebugKit toolbar doesnt show anymore because its doing if (empty($this->output)) check in DebugView

DebugKit should be updated to check the length of $this->output then I think.

Or __isset() should look for the overloaded properties in the same way that __get() does.

Collaborator

this shouldnt be fixed in debugkit only, as apps could rely on this features as well

ceeram@2ee0fbc

would solve it

i also changed return for View->action as i think it makes more sense to return null as thats the default value in request->params['action'] as well

Won't that change have issues when request->params['action'] is undefined? I haven't tried the code out, only read it.

Collaborator

https://github.com/cakephp/cakephp/blob/2.1/lib/Cake/Network/CakeRequest.php#L37 it should have null value by default, thats why i changed the return value as well, its more consistent to return null as well instead of empty string

Hmm, right you are. I'll give the change a try and merge it in :)

ceeram and others added some commits
ADmad

How about making this function a getter too so that if you pass it null param it returns the current default route class name. That could be useful for someone.

+1 for that, simple to do. I can add a pull request and if you guys can decide if you want it. I guess it also stops for setting $_routeClass to null. Also with this option now I think we also need to check if the class is a sublcass of CakeRoute and throw an exception as currently its only done if $options['routeClass'] is set.

Fix with getter option here: tigrang@2656e16

Collaborator

Can you please make a pull request against the 2.1 branch so that your commit can be easily merged in.

I thought I did. Sorry, will do now.

lorenzo and others added some commits
José Lorenzo Rodríguez lorenzo Optimizing and simplifying Configure::write(), this also allows arbit…
…rary nesting limit in configure keys
3a48f64
ceeram ceeram fix magic __isset() 7badb1d
Mark Story markstory Enhance HtmlHelper::getCrumbs() $startText param
It now accepts an array which gives more control and flexibilibity
over the first breadcrumb link.

Fixes #2475
c89c49c
Andy Dawson AD7six prevent block="css" when using inline=false css 22f844c
Andy Dawson AD7six Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 67f4fa0
Tigran Gabrielyan tigrang Fixed typo in DocBlock
Router::defaultRouteClass will return the current routeClass if null is
passed
Router::connect and Router::defaultRouteClass both validate the routeClass
now using Router::_validateRouteClass
f5b62eb
José Lorenzo Rodríguez lorenzo Optimizing Configure::read(), now it is possible to read arbitrarily …
…nested keys
eab2d8a
José Lorenzo Rodríguez lorenzo Optimizing Configure::delete(), you can now delete arbitrarily nested…
… keys
81b41aa
José Lorenzo Rodríguez lorenzo Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 ef568b1
ADmad ADmad Merge pull request #404 from tigrang/router-defaultRouteClass-fix
Router::defaultRouteClass() now returns currently set route class if no param is passed. Also added Router::_validateRouteClass() for route class validation.
f11389f
Jose Diaz-Gonzalez josegonzalez Properly set the current action on CakeRequest when invoking Controll…
…er::setAction()
6046b8d
José Lorenzo Rodríguez lorenzo Merge pull request #406 from josegonzalez/patch-1
Properly set the current action on CakeRequest when invoking Controller::setAction()
2c22d9a
Jose Diaz-Gonzalez josegonzalez Testcase for Controller::setAction() ad2472a
José Lorenzo Rodríguez lorenzo Merge pull request #407 from josegonzalez/patch-1
Missing TestCase for Controller::setAction()
68c919d
Jose Diaz-Gonzalez josegonzalez Fixed broken Controller::setAction() testcase adde2a9
José Lorenzo Rodríguez lorenzo Merge pull request #409 from josegonzalez/patch-1
Fixed broken testcase for Controller::setAction()
b8d2351
Miguel Angel fitorec Reviewing the logic in the Shell::in($prompt, $options = null, $defau…
…lt = null)
ddbaa66
Bob Fanger bfanger Fixes the MethodNotAllowed when deleting a model from an scaffolding …
…view.ctp page
5cb974e
Renan Gonçalves renan Merge pull request #413 from bfanger/2.0
Fixes the MethodNotAllowed when deleting with scaffolding
4059eed
Renan Gonçalves renan Updating test to reflect last changes made by pull #413. 3a3d89d
Scott Harwell scottharwell Added check for duplicate methods to prevent fatal php error 33dc57e
Scott Harwell scottharwell Updated to use camelize rather than classify 153b9f9
Mark Story markstory Fix prefix = false in connect()
Connecting routes with a prefix = false created an un-matchable route.
Ignore falsey prefix values when setting up prefixes.

Fixes #2479
c81fe62
Mark Story markstory Merge pull request #415 from scottharwell/bake-test-plurals
Bake test plurals
c718b10
ceeram ceeram fix that argument with 0 as value will stop parsing args, tests added 8281175
Ivan Majnaric majna Remove unnecessary param when calling begin, commit and rollback on d…
…atasource.
826374e
Ivan Majnaric majna Remove unnecessary condition in Model::getID(). e947df3
Ivan Majnaric majna Update doc block for 'keepExisting' HABTM option. d2dd861
José Lorenzo Rodríguez lorenzo Merge pull request #418 from majna/2.1-model
Cleanup some Model code and update doc block
7e9e3f9
Cauan Cabral CauanCabral Option to return img src with fullpath address 0c0135f
Cauan Cabral CauanCabral Fix test for HtmlHelper::link d2315ef
Cauan Cabral CauanCabral Merge branch 'master' into 2.1 9042667
Mark Story markstory Merge pull request #298 from vitorpc/2.0
Property 'name' removed of PagesController.
8608caa
Mark Story markstory Merge pull request #411 from fitorec/2.0
Check the logic in the Shell::in($prompt, $options = null, $default = null)
e080bb2
Mark Story markstory Simplify how options are checked. 5e495ad
Cauan Cabral CauanCabral Change fullPath option to fullBase in HtmlHelper::image for consistency
Updated test cases for that.
Included doc block about that option.
03bac42
Andy Dawson AD7six allow specifying an explicit root f1f1ce0
Scott Harwell scottharwell Added check for NOT in key when array count === 1 to prevent SQL error e1738c8
José Lorenzo Rodríguez lorenzo Merge pull request #422 from scottharwell/2.1
Fixing possible SQL error when using 'field NOT' => array(1)
6211be2
José Lorenzo Rodríguez lorenzo Adding protocol() method to CakeResponse to be able to change it on t…
…he fly
336ba19
José Lorenzo Rodríguez lorenzo Adding length() method to CakeResponse as a shortcut for Content-Leng…
…th. If you wish to force not Content-Length use length(false)
5b42cb8
José Lorenzo Rodríguez lorenzo Saving a few bytes by unsetting the content if the response status co…
…de is 204 (No Content) or 304 (Not Modified)
4d19d53
José Lorenzo Rodríguez lorenzo Not appending the charset information for content types that are not …
…text/* in CakeResponse
f32c703
José Lorenzo Rodríguez lorenzo Adding expires() to CakeResponse to help adding expiration dates to t…
…he http response cache directives
bab7e77
José Lorenzo Rodríguez lorenzo Implementing the modified() method in CakeResponse to have an easier …
…way of setting the modification time
130b827
José Lorenzo Rodríguez lorenzo Implementing sharable() and maxAge() in CakeResponse for a finer grai…
…n and easier control of cache headers
d9987c9
José Lorenzo Rodríguez lorenzo Adding test case for maxAge() 2428e83
José Lorenzo Rodríguez lorenzo Removing Pragma headers, implementing sharedMaxAge in CakeResponse 552c70a
José Lorenzo Rodríguez lorenzo Implementing mustRevaidate() 3240f62
José Lorenzo Rodríguez lorenzo Adding CakeResponse::vary() 803d49c
José Lorenzo Rodríguez lorenzo Implementing the CakeResponse::etag() dbd097d
José Lorenzo Rodríguez lorenzo Implementing CakeResponse::notModified() 8e979cc
José Lorenzo Rodríguez lorenzo Implementing RequestHandler::checkNotModified() as a helper for HTTP …
…caching
dffe84c
José Lorenzo Rodríguez lorenzo fixing doc comment identation a7662eb
José Lorenzo Rodríguez lorenzo Fixing typo in docblock 6839f0c
José Lorenzo Rodríguez lorenzo Moving checkModified() to CakeResponse, having it in the RequestHandl…
…er has too restrivtive
b79e0ad
José Lorenzo Rodríguez lorenzo Making it possible to cancel the render() process from any beforeRend…
…er listener
28ee27e
José Lorenzo Rodríguez lorenzo Fixing a couple bugs in CakeResponse::checkNotModified() and implemen…
…ting conditional rendering in

RequestHandlerComponent
979f7a2
José Lorenzo Rodríguez lorenzo Fixing some failing test cases 769a5c2
Andy Dawson AD7six Merge branch 'feature/set-nest' into 2.1
Conflicts:
	lib/Cake/Model/Model.php
a5240e2
Andy Dawson AD7six Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 b62d972
Stefano Zoffoli stefanozoffoli Prevent blackhole auth error where are present multi fields c3b806c
ADmad ADmad Removed constant available only in php 5.3 and changed exception type…
… to fix errors on php 5.2. Fixes #2487
2c239cc
ceeram ceeram allow other parent field, set in find options or TreeHebavior, for th…
…readed find. Fixes #1769
2a9e677
ADmad ADmad Removed constant available only in php 5.3 and changed exception type…
… to fix errors on php 5.2. Fixes #2487
d61b6dc
Walter Nasich wnasich Test case and Fix for: Number::currency() issue
Fixes currency() for custom formats and numbers between -1 and 1.

Fixes #2489

Conflicts:

	lib/Cake/Test/Case/View/Helper/NumberHelperTest.php
	lib/Cake/View/Helper/NumberHelper.php
c95ab28
Mark Story markstory Update Model::saveAssociated() documentation
Fixes #2492
eb101b9
Mark Story markstory Merge pull request #424 from stefanozoffoli/patch-2
Prevent blackhole auth error where are present multi fields
599d8b8
Mark Story markstory Reformat long line. ad304e0
Mark Story markstory Adding test for #GH424 1693478
José Lorenzo Rodríguez lorenzo Not sending the response in beforeRender, better let Dispatcher do it…
…s work
5df2a09
José Lorenzo Rodríguez lorenzo Readability changes 00a5510
Mark Story markstory Add test for Validation::url() + sftp. 69a69d4
Matt Potts mattpotts added sftp to url() 1c64515
Mark Story markstory Merge changes from 1.3 to 2.0
Merge changes from #GH284 from 1.3 to 2.0.
Model::validate() no longer does queries when its not
necessary.
a70c8c7
ceeram ceeram set correct default validate option, now matches saveAll/saveMany def…
…ault value, fixes #2492
d4e2fbf
Mark Story markstory Merge changes from hmic/CakeEmail-2.0
Adds parameters for file attachments instead of having
boundary prefixes in multiple places.

Fixes #GH433
e6f5ebc
Mark Story markstory Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Routing/RouterTest.php
df5d9ac
Mark Story markstory Add note about PHP's include_path.
Refs #2497
bc68915
Mark Story markstory Add validation guess for not null + text types.
Fixes #2493
70bb839
José Lorenzo Rodríguez lorenzo Preventing datasource creationa and access on models having $useTable…
… = false;
6aa08b5
José Lorenzo Rodríguez lorenzo Logging transaction commands in DboSource, fixes #2457 37314a2
José Lorenzo Rodríguez lorenzo Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 1884cd1
José Lorenzo Rodríguez lorenzo Merge branch '2.1-http' into 2.1 a1daaf5
Yusuke Ando yandod Set encoding in CSS file.
Signed-off-by: mark_story <mark@mark-story.com>
b8d67e5
José Lorenzo Rodríguez lorenzo Merge remote-tracking branch 'origin/2.0' into 2.1 b9ad469
Jose Diaz-Gonzalez josegonzalez Merging ThemeView and View class
In 2.1, the ThemeView is merely a small wrapper around View with extra paths set. Merging these two classes means there is one less property for developers to set to enable themes in their applications.
c2519e7
José Lorenzo Rodríguez lorenzo Merge pull request #437 from josegonzalez/2.1-theme-view
2.1 theme view
5cc2860
José Lorenzo Rodríguez lorenzo Avoiding class name conflicts 9d0a67d
Graham Weldon predominant Added default prefix to cache configurations. 64d4387
Graham Weldon predominant Merge pull request #438 from predominant/2.1
Prefix for cache configuration
4867902
José Lorenzo Rodríguez lorenzo Update version number to 2.1.0-beta 62b203f
ceeram ceeram Merge branch '2.1-appshell' into 2.1 4f1be12
Kyle Robinson Young shama Remove incorrect parameter in HtmlHelper::script docblock example
Fixes #76
f69edb5
José Lorenzo Rodríguez lorenzo Merge pull request #440 from shama/patch-html-doc
Remove incorrect parameter in HtmlHelper::script docblock example
c877d17
Mark Story markstory Fix issues with sparse arrays in ThemeView.
Fixes #2500
354716c
ceeram ceeram include theme in _passedVars array 95aa7e3
Andy Dawson AD7six throw an exception if the view you try to extend doesn't exist
or element, or layout
def96c0
Andy Dawson AD7six Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 11ed1e6
Mark Story markstory Fix indentation. b8e27c7
Mark Story markstory Add test for saveField() + foreign key.
Closes #2507
dbece1f
Mark Story markstory Fix re-numbering of values in exportVar()
Using array_merge resulted in values being re-indexed,
change how arrays are combined to preserve keys.

Fixes #2506
29514b0
Mark Story markstory Add methods to CakeTestCase
Add assertTextEquals, and assertTextNotEquals for doing
platform independant text comparisons.

Refs #2148
bd0104d
Mark Story markstory Fix tests that fail on windows.
Refs #2148
154b001
ceeram ceeram update book link 6d69ec3
Andy Dawson AD7six Make extending a missing element throw an exception
A layout extending a missing layout throws a missing-layout exception
A view extendinga missing view throws a missing-view exception
Now, an element extending a missing element throws a logic exception

in addition "absolute" paths can be used such that (using elements as an
example)

$this->extend('foo') - extends View/Elements/foo.ctp
$this->extend('/foo') - extends View/foo.ctp

Closes #2504
ecbe337
Mark Story markstory Wrap aliases containing , in ""
Fixes #2502
f02a3b0
Mark Story markstory Merge pull request #419 from radig/2.1
Fix HtmlHelper::link test and extend HtmlHelper::image (issue #2476)
7cfd27e
Mark Story markstory Update image() docs. 5b9d69f
Mark Story markstory Fix failing test. 9089bba
ADmad ADmad Updating minimum PHP version requirement to 5.2.8 due to PHP bugs #44…
…251 and #45748. Closes #2509
00649cb
ceeram ceeram Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/View/ThemeView.php
7eda0af
ceeram ceeram fix correct node lookup when authorize object uses plugin userModel s…
…etting, fixes #2464
fb3c3e4
Mark Story markstory Merge branch '2.0' into 2.1 d904ab0
Mark Story markstory Improving test generation.
Class construction can be a bit more complicated now.
9ff0739
Mark Story markstory Add tests for previous commit. 3b9f880
Mark Story markstory Fix wonky tabs. fb7717c
Mark Story markstory Fix missing behavior constructor. 752711e
Romanenko Alexey slimus fix shell help for incorrect user input 57e4751
Romanenko Alexey slimus Update lib/Cake/Console/Shell.php 7c08e4b
José Lorenzo Rodríguez lorenzo Merge pull request #447 from slimus/2.1
2.1 fix bake shell options
f28ba90
Ivan Majnaric majna Add option for 'current' class to PaginationHelper::numbers(). d7b0619
Mark Story markstory Merge pull request #448 from majna/2.1-paging-current
Add option for 'current' class to PaginationHelper::numbers().
21cf8ad
Mark Story markstory Split Cache + CacheEngine into separate files.
Refs #2514
0fb6f88
Mark Story markstory Split I18nModel into a separate file.
Refs #2514
b905316
Mark Story markstory Splitting ConfigReaderInterface out into a separate file.
Refs #2514
1600322
Mark Story markstory Split the AclComponent classes up.
Refs #2514
e770c7a
Mark Story markstory Remove odd inflection.
This additional inflection isn't needed.  People can type the classname
they want.

Refs #2514
a4740f0
Christopher Vrooman cdvrooman Minor typographical changes 0d795e2
ADmad ADmad closed this
ADmad
Collaborator

You have made the pull request against the master branch instead of 2.1 :)

ceeram
Collaborator

should this be replaced with: pear install cakephp/Phing_d51PearPkg2Task ?

Owner

Yeah it should be, I'll update that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.