Commit graph

12694 commits

Author SHA1 Message Date
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
José Lorenzo Rodríguez
6211be2acc Merge pull request #422 from scottharwell/2.1
Fixing possible SQL error when using 'field NOT' => array(1)
2012-01-18 15:12:15 -08:00
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
José Lorenzo Rodríguez
7e9e3f92a7 Merge pull request #418 from majna/2.1-model
Cleanup some Model code and update doc block
2012-01-17 14:33:54 -08: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
0x20h
54869fc965 moved note about 'default' cache configuration to the APC config docblock 2012-01-17 19:39:46 +01:00
Mark Story
c718b102a9 Merge pull request #415 from scottharwell/bake-test-plurals
Bake test plurals
2012-01-17 09:23:07 -08:00
0x20h
588090da21 moved docblock on default cache configuration to bootstrap.php, left a note in core.php 2012-01-17 08:58:22 +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
Renan Gonçalves aka renan.saddam
4059eed3a7 Merge pull request #413 from bfanger/2.0
Fixes the MethodNotAllowed when deleting with scaffolding
2012-01-16 07:37:31 -08: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
José Lorenzo Rodríguez
b8d23515b0 Merge pull request #409 from josegonzalez/patch-1
Fixed broken testcase for Controller::setAction()
2012-01-15 12:20:34 -08:00
Jose Diaz-Gonzalez
adde2a9af5 Fixed broken Controller::setAction() testcase 2012-01-15 15:16:49 -05:00
José Lorenzo Rodríguez
68c919d787 Merge pull request #407 from josegonzalez/patch-1
Missing TestCase for Controller::setAction()
2012-01-15 12:04:03 -08:00
Jose Diaz-Gonzalez
ad2472aab0 Testcase for Controller::setAction() 2012-01-15 15:00:30 -05:00
José Lorenzo Rodríguez
2c22d9accf Merge pull request #406 from josegonzalez/patch-1
Properly set the current action on CakeRequest when invoking Controller::setAction()
2012-01-15 11:36:01 -08: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