mark_story
4dd13ef554
Fix issue where session would always be regenerated.
...
Fixes #2519
2012-01-29 15:37:14 -05:00
mark_story
a4740f02f1
Remove odd inflection.
...
This additional inflection isn't needed. People can type the classname
they want.
Refs #2514
2012-01-29 13:56:53 -05:00
mark_story
e770c7a72d
Split the AclComponent classes up.
...
Refs #2514
2012-01-29 13:54:26 -05:00
mark_story
1600322a54
Splitting ConfigReaderInterface out into a separate file.
...
Refs #2514
2012-01-29 13:30:05 -05:00
mark_story
b9053161f4
Split I18nModel into a separate file.
...
Refs #2514
2012-01-29 13:28:08 -05:00
mark_story
0fb6f88a2e
Split Cache + CacheEngine into separate files.
...
Refs #2514
2012-01-29 13:25:06 -05:00
ADmad
ca32ca185a
Fixing API docblock
2012-01-29 22:24:26 +05:30
Tigran Gabrielyan
30d6341e7f
Fixed bug in CacheHelper where PluginAppController was not being loaded
...
Signed-off-by: mark_story <mark@mark-story.com>
2012-01-28 22:35:42 -05:00
Mark Story
21cf8ad018
Merge pull request #448 from majna/2.1-paging-current
...
Add option for 'current' class to PaginationHelper::numbers().
2012-01-28 10:06:56 -08:00
Majna
d7b06194a4
Add option for 'current' class to PaginationHelper::numbers().
2012-01-28 18:24:28 +01:00
slimus
7c08e4b0f4
Update lib/Cake/Console/Shell.php
2012-01-28 23:45:44 +07:00
slimus
57e4751a82
fix shell help for incorrect user input
2012-01-28 16:36:59 +07:00
mark_story
752711e963
Fix missing behavior constructor.
2012-01-27 21:10:57 -05:00
mark_story
fb7717c0da
Fix wonky tabs.
2012-01-27 20:59:03 -05:00
mark_story
3b9f88030e
Add tests for previous commit.
2012-01-27 20:59:03 -05:00
mark_story
9ff0739504
Improving test generation.
...
Class construction can be a bit more complicated now.
2012-01-27 20:59:03 -05:00
mark_story
d904ab00fa
Merge branch '2.0' into 2.1
2012-01-27 20:58:24 -05:00
Ceeram
fb3c3e4df8
fix correct node lookup when authorize object uses plugin userModel setting, fixes #2464
2012-01-27 00:16:22 +01:00
Ceeram
7eda0affe3
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/View/ThemeView.php
2012-01-26 21:40:18 +01:00
ADmad
00649cbdde
Updating minimum PHP version requirement to 5.2.8 due to PHP bugs #44251 and #45748 . Closes #2509
2012-01-26 17:56:42 +05:30
mark_story
9089bba84b
Fix failing test.
2012-01-25 21:19:16 -05:00
mark_story
5b9d69fcc8
Update image() docs.
2012-01-25 21:14:01 -05:00
Mark Story
7cfd27e7f6
Merge pull request #419 from radig/2.1
...
Fix HtmlHelper::link test and extend HtmlHelper::image (issue #2476 )
2012-01-25 18:05:56 -08:00
mark_story
f02a3b0531
Wrap aliases containing , in ""
...
Fixes #2502
2012-01-25 21:03:03 -05:00
AD7six
ecbe337052
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
2012-01-25 13:04:45 +01:00
Ceeram
6d69ec3a78
update book link
2012-01-25 10:12:59 +01:00
mark_story
154b001552
Fix tests that fail on windows.
...
Refs #2148
2012-01-24 21:12:26 -05:00
mark_story
bd0104d972
Add methods to CakeTestCase
...
Add assertTextEquals, and assertTextNotEquals for doing
platform independant text comparisons.
Refs #2148
2012-01-24 21:08:56 -05:00
mark_story
29514b08fb
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
2012-01-24 20:52:43 -05:00
mark_story
dbece1f157
Add test for saveField() + foreign key.
...
Closes #2507
2012-01-24 20:32:48 -05:00
mark_story
b8e27c7588
Fix indentation.
2012-01-24 20:32:06 -05:00
AD7six
11ed1e6ea5
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-24 13:55:56 +01:00
AD7six
def96c0460
throw an exception if the view you try to extend doesn't exist
...
or element, or layout
2012-01-24 13:54:39 +01:00
Ceeram
95aa7e32c3
include theme in _passedVars array
2012-01-24 10:42:18 +01:00
mark_story
354716cf60
Fix issues with sparse arrays in ThemeView.
...
Fixes #2500
2012-01-23 20:22:06 -05:00
Kyle Robinson Young
f69edb5c80
Remove incorrect parameter in HtmlHelper::script docblock example
...
Fixes #76
2012-01-23 16:01:38 -08:00
Ceeram
4f1be12046
Merge branch '2.1-appshell' into 2.1
2012-01-23 15:29:03 +01:00
Jose Lorenzo Rodriguez
62b203f54c
Update version number to 2.1.0-beta
2012-01-22 21:18:22 -04:30
Graham Weldon
64d4387c82
Added default prefix to cache configurations.
2012-01-23 10:43:21 +11:00
Jose Lorenzo Rodriguez
9d0a67ddec
Avoiding class name conflicts
2012-01-22 16:46:41 -04:30
José Lorenzo Rodríguez
5cc2860c41
Merge pull request #437 from josegonzalez/2.1-theme-view
...
2.1 theme view
2012-01-22 12:52:00 -08:00
Jose Diaz-Gonzalez
c2519e702d
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.
2012-01-22 15:45:26 -05:00
Jose Lorenzo Rodriguez
b9ad469a65
Merge remote-tracking branch 'origin/2.0' into 2.1
2012-01-22 15:52:54 -04:30
Yusuke Ando
b8d67e581a
Set encoding in CSS file.
...
Signed-off-by: mark_story <mark@mark-story.com>
2012-01-22 11:34:16 -05:00
Jose Lorenzo Rodriguez
a1daaf5960
Merge branch '2.1-http' into 2.1
2012-01-21 15:51:34 -04:30
Jose Lorenzo Rodriguez
1884cd1f28
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-21 15:49:25 -04:30
Jose Lorenzo Rodriguez
37314a2188
Logging transaction commands in DboSource, fixes #2457
2012-01-21 15:48:17 -04:30
Jose Lorenzo Rodriguez
6aa08b5f52
Preventing datasource creationa and access on models having $useTable = false;
2012-01-21 14:03:11 -04:30
mark_story
70bb839de9
Add validation guess for not null + text types.
...
Fixes #2493
2012-01-21 13:10:30 -05:00
mark_story
bc689151a4
Add note about PHP's include_path.
...
Refs #2497
2012-01-21 10:23:25 -05:00
mark_story
df5d9ac3d1
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Routing/RouterTest.php
2012-01-20 20:28:15 -05:00
mark_story
e6f5ebc257
Merge changes from hmic/CakeEmail-2.0
...
Adds parameters for file attachments instead of having
boundary prefixes in multiple places.
Fixes #GH433
2012-01-20 20:17:02 -05:00
Ceeram
d4e2fbf6b8
set correct default validate option, now matches saveAll/saveMany default value, fixes #2492
2012-01-20 11:02:13 +01:00
mark_story
a70c8c7ac3
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.
2012-01-19 22:50:40 -05:00
mattpotts
1c645152ca
added sftp to url()
2012-01-19 22:05:10 -05:00
mark_story
69a69d48a2
Add test for Validation::url() + sftp.
2012-01-19 22:04:10 -05:00
Jose Lorenzo Rodriguez
00a5510b1d
Readability changes
2012-01-19 22:26:59 -04:30
Jose Lorenzo Rodriguez
5df2a0957f
Not sending the response in beforeRender, better let Dispatcher do its work
2012-01-19 22:26:32 -04:30
mark_story
1693478889
Adding test for #GH424
2012-01-19 21:50:51 -05:00
mark_story
ad304e0b43
Reformat long line.
2012-01-19 21:50:51 -05:00
Mark Story
599d8b885c
Merge pull request #424 from stefanozoffoli/patch-2
...
Prevent blackhole auth error where are present multi fields
2012-01-19 18:50:39 -08:00
mark_story
eb101b9eb8
Update Model::saveAssociated() documentation
...
Fixes #2492
2012-01-19 21:10:46 -05:00
wnasich
c95ab282dc
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
2012-01-19 21:07:27 -05:00
ADmad
d61b6dc7d3
Removed constant available only in php 5.3 and changed exception type to fix errors on php 5.2. Fixes #2487
2012-01-20 04:05:40 +05:30
Ceeram
2a9e6771c3
allow other parent field, set in find options or TreeHebavior, for threaded find. Fixes #1769
2012-01-19 23:26:43 +01:00
ADmad
2c239cc851
Removed constant available only in php 5.3 and changed exception type to fix errors on php 5.2. Fixes #2487
2012-01-20 03:31:08 +05:30
Stefano Zoffoli
c3b806ce8c
Prevent blackhole auth error where are present multi fields
2012-01-19 17:48:39 +01:00
AD7six
b62d9729a9
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-19 10:51:24 +01:00
AD7six
a5240e23ab
Merge branch 'feature/set-nest' into 2.1
...
Conflicts:
lib/Cake/Model/Model.php
2012-01-19 10:51:09 +01:00
Jose Lorenzo Rodriguez
769a5c24e6
Fixing some failing test cases
2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
979f7a28b5
Fixing a couple bugs in CakeResponse::checkNotModified() and implementing conditional rendering in
...
RequestHandlerComponent
2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
28ee27e2dd
Making it possible to cancel the render() process from any beforeRender listener
2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
b79e0ad8f3
Moving checkModified() to CakeResponse, having it in the RequestHandler has too restrivtive
2012-01-19 01:08:45 -04:30
José Lorenzo Rodríguez
6839f0c450
Fixing typo in docblock
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
a7662eba57
fixing doc comment identation
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
dffe84cfbc
Implementing RequestHandler::checkNotModified() as a helper for HTTP caching
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
8e979cc83e
Implementing CakeResponse::notModified()
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
dbd097debb
Implementing the CakeResponse::etag()
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
803d49c7c6
Adding CakeResponse::vary()
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
3240f6221e
Implementing mustRevaidate()
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
552c70a571
Removing Pragma headers, implementing sharedMaxAge in CakeResponse
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
2428e83e3f
Adding test case for maxAge()
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
d9987c96db
Implementing sharable() and maxAge() in CakeResponse for a finer grain and easier control of cache headers
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
130b827e6f
Implementing the modified() method in CakeResponse to have an easier way of setting the modification time
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
bab7e772d2
Adding expires() to CakeResponse to help adding expiration dates to the http response cache directives
2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
f32c703e7e
Not appending the charset information for content types that are not text/* in CakeResponse
2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
4d19d536f6
Saving a few bytes by unsetting the content if the response status code is 204 (No Content) or 304 (Not Modified)
2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
5b42cb8130
Adding length() method to CakeResponse as a shortcut for Content-Length. If you wish to force not Content-Length use length(false)
2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
336ba1965e
Adding protocol() method to CakeResponse to be able to change it on the fly
2012-01-19 01:08:43 -04:30
Scott Harwell
e1738c8c4a
Added check for NOT in key when array count === 1 to prevent SQL error
2012-01-18 15:04:53 -05:00
AD7six
f1f1ce0db4
allow specifying an explicit root
2012-01-18 13:05:44 +01:00
Cauan Cabral
03bac42366
Change fullPath option to fullBase in HtmlHelper::image for consistency
...
Updated test cases for that.
Included doc block about that option.
2012-01-18 08:32:40 -03:00
mark_story
5e495ad90c
Simplify how options are checked.
2012-01-17 21:57:22 -05:00
Mark Story
e080bb27b9
Merge pull request #411 from fitorec/2.0
...
Check the logic in the Shell::in($prompt, $options = null, $default = null)
2012-01-17 18:53:00 -08:00
Mark Story
8608caa8a2
Merge pull request #298 from vitorpc/2.0
...
Property 'name' removed of PagesController.
2012-01-17 18:52:26 -08:00
Cauan Cabral
90426674cb
Merge branch 'master' into 2.1
2012-01-17 23:18:54 -03:00
Cauan Cabral
d2315ef35b
Fix test for HtmlHelper::link
2012-01-17 23:15:11 -03:00
Cauan Cabral
0c0135ff5e
Option to return img src with fullpath address
2012-01-17 22:55:24 -03:00
Majna
d2dd861417
Update doc block for 'keepExisting' HABTM option.
2012-01-17 22:02:30 +01:00
Majna
e947df36a5
Remove unnecessary condition in Model::getID().
2012-01-17 21:57:40 +01:00
Majna
826374e57c
Remove unnecessary param when calling begin, commit and rollback on datasource.
2012-01-17 21:52:22 +01:00
Ceeram
828117583f
fix that argument with 0 as value will stop parsing args, tests added
2012-01-17 20:01:40 +01:00
mark_story
c81fe6249d
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
2012-01-16 21:30:26 -05:00
Scott Harwell
153b9f9ee2
Updated to use camelize rather than classify
2012-01-16 20:52:05 -05:00
Scott Harwell
33dc57e667
Added check for duplicate methods to prevent fatal php error
2012-01-16 14:45:12 -05:00
Renan Gonçalves
3a3d89d6d1
Updating test to reflect last changes made by pull #413 .
2012-01-16 16:51:49 +01:00
Bob Fanger
5cb974ee70
Fixes the MethodNotAllowed when deleting a model from an scaffolding view.ctp page
2012-01-16 16:21:06 +01:00
Fitorec
ddbaa66997
Reviewing the logic in the Shell::in($prompt, $options = null, $default = null)
2012-01-15 21:16:45 -06:00
Jose Diaz-Gonzalez
adde2a9af5
Fixed broken Controller::setAction() testcase
2012-01-15 15:16:49 -05:00
Jose Diaz-Gonzalez
ad2472aab0
Testcase for Controller::setAction()
2012-01-15 15:00:30 -05:00
Jose Diaz-Gonzalez
6046b8d013
Properly set the current action on CakeRequest when invoking Controller::setAction()
2012-01-15 14:32:09 -05:00
ADmad
f11389fd10
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.
2012-01-15 00:44:43 -08:00
Jose Lorenzo Rodriguez
ef568b1159
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-14 23:31:56 -04:30
Jose Lorenzo Rodriguez
81b41aa561
Optimizing Configure::delete(), you can now delete arbitrarily nested keys
2012-01-14 23:30:31 -04:30
Jose Lorenzo Rodriguez
eab2d8aa66
Optimizing Configure::read(), now it is possible to read arbitrarily nested keys
2012-01-14 23:22:08 -04:30
Tigran Gabrielyan
f5b62eb84c
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
2012-01-14 18:45:51 -08:00
AD7six
67f4fa0f20
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-15 01:03:48 +01:00
AD7six
22f844c48f
prevent block="css" when using inline=false css
2012-01-15 01:03:17 +01:00
mark_story
c89c49c310
Enhance HtmlHelper::getCrumbs() $startText param
...
It now accepts an array which gives more control and flexibilibity
over the first breadcrumb link.
Fixes #2475
2012-01-14 13:14:26 -05:00
Ceeram
7badb1d252
fix magic __isset()
2012-01-14 12:42:10 -05:00
Jose Lorenzo Rodriguez
3a48f64370
Optimizing and simplifying Configure::write(), this also allows arbitrary nesting limit in configure keys
2012-01-14 02:15:31 -04:30
mark_story
b14072aa6f
Add Router::defaultRouteClass()
...
Apply patch from 'Tigran Gabrielyan'.
Allows you to set the default route class used for all future
routes.
Fixes #2435
2012-01-12 22:19:55 -05:00
Mark Story
533feea2b1
Merge pull request #403 from rintaun/patch-2
...
$action in AclShell::_getParams() should default to '*', not NULL
2012-01-12 19:08:42 -08:00
Mark Story
b76f8f8832
Merge pull request #260 from tPl0ch/2.1-authenticate
...
Added 'recursive' settings option to BaseAuthenticate and BasicAuthenticate
2012-01-12 18:53:19 -08:00
mark_story
b6040aec5a
Update UpgradeShell for App classes.
...
Correctly move AppController and AppModel.
Fixes #2472
2012-01-12 21:37:34 -05:00
Jose Lorenzo Rodriguez
2c5cb1157f
Merge branch '2.1-alltests' into 2.1
2012-01-12 20:13:58 -04:30
Jose Lorenzo Rodriguez
e25867da79
Catching any possible exception in DatabaseSession destructor, using exceptions in destructors is a bad idea in PHP
2012-01-12 20:12:38 -04:30
Jose Lorenzo Rodriguez
205064f11e
Merge remote-tracking branch 'origin/2.1' into 2.1
2012-01-12 19:14:50 -04:30
Jose Lorenzo Rodriguez
e6e14a7ff9
Fixing php 5.2 specific problem, closes #2468
2012-01-12 19:13:56 -04:30
Ceeram
eaf6f0e2c1
add missing App::uses()
2012-01-12 18:01:27 +01:00
Ceeram
9c652e6573
add missing tests
2012-01-12 13:06:24 +01:00
Ceeram
9f40e6de79
move AppShell to app/Console/Command directory
2012-01-12 11:55:10 +01:00
AD7six
7414d0f77b
rename set::getValue to set::get - and make it public
2012-01-12 09:45:28 +01:00
Matthew Lanigan
0e607bf880
$action in AclShell::_getParams() defaults to '*', not NULL
2012-01-11 21:59:58 -05:00
mark_story
97ce118294
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Utility/ClassRegistry.php
2012-01-11 20:59:31 -05:00
Jose Lorenzo Rodriguez
1a741b853b
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-11 21:26:12 -04:30
Jose Lorenzo Rodriguez
c53f0e6877
Explicitly casting to string a variable that could in times be either string or integer
2012-01-11 21:25:22 -04:30
mark_story
4d73f4e6a1
Fix boundaries used in multi-part messages.
...
Inline attachments should use the multipart/related boundary. Otherwise
sections will be incorrectly nested.
Fixes #2413
2012-01-11 20:44:42 -05:00
Hans-Joachim Michl
29cfdb4b41
Fixed wrong boundary marker for inline-files, inline-files should start 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
2012-01-11 20:30:49 -05:00
mark_story
0f8e1500de
Ensure helpers are loaded in data views.
...
Both XmlView and JsonView should load helpers when
they use view files.
Fixes #2465
2012-01-11 20:21:56 -05:00
Victor Yap
cf8c1cd93b
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
2012-01-11 17:27:39 -05:00
mark_story
32cb416ad7
Replace smart quotes with ASCII equivalents.
...
Fixes #2466
2012-01-11 13:38:50 -05:00
mark_story
aeda986745
Add additional empty() for tablePrefix.
...
Fixes compatibility issues with plugins that worked correctly in
previous point releases.
Fixes #2462
2012-01-10 21:01:03 -05:00
mark_story
7877e7f997
Make allow(null) and deny(null) consistent with no args.
...
No arguments and a single null should be handled the same.
Fixes #2461
2012-01-10 20:32:12 -05:00
mark_story
a8bc916104
Move check out of the loop, and allow nulls.
...
Refs #2341
2012-01-10 20:15:59 -05:00
AD7six
941d503726
documentation clarification
2012-01-10 10:52:07 +01:00
AD7six
a62c5350b3
whitespace
2012-01-10 10:51:06 +01:00
AD7six
d5fdf45e51
add a test for what happens when you nest on a field that doesn't exist
2012-01-10 10:49:17 +01:00
AD7six
3b1dd82603
add tests for set nest method
2012-01-10 10:18:59 +01:00
AD7six
d534013570
reduce code repetition
2012-01-10 09:47:51 +01:00