mark_story
c31858635f
Don't OR options together.
...
By default FILTER_VALIDATE_IP does both.
2012-06-10 20:29:48 -04:00
mark_story
963f1ca449
Don't |= with null.
2012-06-10 20:21:59 -04:00
mark_story
b2e82871f1
Attempt to fix failing build.
2012-06-10 20:08:17 -04:00
mark_story
7ae660c779
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Cache/Engine/XcacheEngine.php
2012-06-10 20:05:25 -04:00
mark_story
0a182b918f
Fix $depth being decremented by 2.
...
$depth should only be decremented once for each step-in.
Add special text when values are being elided by maximum nesting level.
Fixes #2946
2012-06-10 20:00:34 -04:00
mark_story
454fae9bd0
Fix Validation::ip() not respecting type.
...
Apply patch from 'Xavier Franquet' to fix ip(), so that
it does not always validate both IP versions.
Fixes #2944
2012-06-10 19:37:44 -04:00
ADmad
9ce216b09d
Revert "Fix missing view variables."
...
Commit 7416c53
shows error message from last exception instead of first one
and also displays framework specific error messages instead of generic ones with debug off.
We don't want either.
This reverts commit 7416c530a2
.
2012-06-11 02:36:51 +05:30
ADmad
fa0d1c7997
Fix layout path value causing View to generate layout paths with extra slash at end
2012-06-10 22:19:39 +05:30
Jose Lorenzo Rodriguez
5ba5f906e6
Adding new test case for ModelValidator
2012-06-09 15:27:22 -04:30
Jose Lorenzo Rodriguez
2a90baae0c
Forgot to include complete patch in last commit :(
...
Note: It's not good to commit while watching tv
2012-06-09 15:01:27 -04:30
Jose Lorenzo Rodriguez
d13deb7da2
Fixing param usage introduced in previous commit
2012-06-09 14:52:03 -04:30
Jose Lorenzo Rodriguez
a2c2902dd6
Renaming param in CakeTime::format() to make its purpose more obvious,
...
added some examples in doc block
2012-06-09 08:45:46 -04:30
Jose Lorenzo Rodriguez
0d013f8da5
Fixing CakeTime, the actual params for format() is $date and $format,
...
and not the other way around :)
2012-06-09 08:28:39 -04:30
José Lorenzo Rodríguez
56b2b8a8da
Merge pull request #687 from fiblan/xcache_cli
...
Xcache is not available for php-cli
2012-06-08 04:35:29 -07:00
fiblan
d2ac734da6
Xcache is not available for php-cli
2012-06-08 11:14:22 +02:00
Jelle Henkens
c8e58b50ba
Adding cake core message extraction in cake extract
2012-06-07 23:55:36 +01:00
AD7six
43b37cd608
Revert "actually, just ensure the path is slash terminated"
...
This reverts commit e88a2bcdbb
.
2012-06-07 23:32:43 +02:00
AD7six
e88a2bcdbb
actually, just ensure the path is slash terminated
...
that way we're all good
2012-06-07 23:29:49 +02:00
AD7six
72a36a0929
correct path in error message for a missing component
...
PluginNameController/Component
becomes
PluginName/Controller/Component
2012-06-07 23:05:32 +02:00
AD7six
33c112b353
doesn'st need to be a verbose level message
...
other create mesages are output normally
2012-06-07 23:03:53 +02:00
AD7six
488ba9ef85
Make baking a plugin more user friendly.
...
Changed the text when the plugin already exists to indicate that the task stops
intentionally.
If there are folder errors - report them in the cli.
Choose the last plugin path by default
Modify the app's bootstrap file if it's not being (obviously) loaded already.
This means it is now possible to do:
Console/cake bake plugin MyPlugin
Console/cake bake model MyPlugin.MyModel
Previously the above would result in an error (which only if you know), you'd
fix by editing your Config/bootstrap.php file by hand before retrying to bake
your model.
2012-06-07 09:04:02 +02:00
mark_story
f3464b002f
Remove duplicate code.
...
Use a shutdown function to close the session off.
This removes a bit of icky code and continues to allow
objects to be used as session handlers.
2012-06-06 21:01:16 -04:00
AD7six
2335ef1a13
remove pseudo-mock code
...
Not required, not used by any committed code
2012-06-06 23:08:40 +02:00
AD7six
a56ec8d6cf
Correct TestTask tests
...
there will not be a setUp function for Controller tests
there will not be a tearDown
there will be no returned constructor logic from generateConstructor
all because for a controller test - you'd ordinarilly just call this->testAction
2012-06-06 23:04:18 +02:00
AD7six
b509bdb04b
Automatically handle PUT requests
...
make the following "just work"
curl -X PUT -d foo=bar http://...
2012-06-06 22:59:37 +02:00
AD7six
d1475b1fd3
initialize $construct variable
2012-06-06 22:24:15 +02:00
AD7six
a5fabcc1dc
No startup and teardown for controller tests
...
and.. no startup/teardown functions unless they are actually going to do more
than just call parent
2012-06-06 21:06:37 +02:00
Jose Lorenzo Rodriguez
51635c2ca6
Merge remote-tracking branch 'origin/2.1' into 2.2
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
2012-06-06 11:06:06 -04:30
Jose Lorenzo Rodriguez
111a23274e
Fixing yet another issue related to beforeValidate and
...
validateAssociated
2012-06-06 10:07:01 -04:30
AD7six
ad7b5bfb88
fix whitespace
...
tabs for indentation
spaces for alignment
2012-06-06 14:32:43 +02:00
AD7six
36e15a065b
Make app/Console/cake pwd insensitive
...
With the previous versions of cake - you'd install cake in your path and
therefore when executed the pwd was a variable.
With the creation of app/Console/cake this is not true any more, and
copying the existing use of `pwd` for app means there is an implicit
assumption that it will always and only be ran from the app dir. If it
is ran from elsewhere - it's as if the core lib/Cake/Console/cake
had been run (app dir is "missing" no boostrap, no app-plugins etc.)
With this change, all of these act exactly the same:
cd ~/root/app
Console/cake
cd ~/root/app/Console
./cake
cd ~/root
app/Console/cake
cd /anywhere
~/root/app/Console/cake
2012-06-06 14:32:43 +02:00
Rachman Chavik
8966f1b324
create CakeRequest in View instead of in CakeEmail
2012-06-04 22:21:41 +07:00
Rachman Chavik
e821c27f54
remove unnecessary lines
2012-06-04 09:18:36 +07:00
Rachman Chavik
9bafc5a3bb
CakeEmail: create request object before rendering
...
Closes #2931
2012-06-04 09:18:29 +07:00
mark_story
fceb028499
Fix code style errors.
2012-06-03 21:11:34 -04:00
Jelle Henkens
0e34bd4b1d
Suggest current path in bake project if dir is empty
2012-06-03 14:01:03 +01:00
mark_story
8da42dfcfa
Merge branch '2.1' into 2.2
2012-06-02 20:57:05 -04:00
mark_story
d1819dcabb
Fix page 0 issue.
...
Refs #2929
2012-06-02 20:56:38 -04:00
mark_story
15a423ad70
Restrict page number passed to view.
...
Limit the page number to the max page number when passing data to the
view. This prevents the helper from generating a huge number of links.
Fixes #2929
2012-06-02 20:26:09 -04:00
mark_story
157e243eee
Change named capture group syntax.
...
This increases compatibility with really old version of
PCRE used on CentOS.
Refs #GH-681
2012-06-02 10:09:58 -04:00
Ceeram
4c6453501e
Merge branch '2.1' into 2.2
2012-06-02 01:47:21 +02:00
Ceeram
048dc8d254
casting schema to array, fixes error for array_keys when return is null
2012-06-02 01:39:53 +02:00
Jelle Henkens
e5eb7b490e
Preventing cache collisions by adding the the datasource key
2012-06-01 10:42:26 +01:00
Jelle Henkens
18b335a605
Replacing crc32 with md5 for less collisions in method caching
2012-06-01 10:42:26 +01:00
Rachman Chavik
07d9a75fcb
Helpers in custom CakeErrorController are lost
...
Since many exceptions do not have its own 'template' file, customized
APP/Controller/CakeErrorController with its own list of helpers could be
ignored.
This happens becase ExceptionRenderer is forced to to use _outputMessageSafe
when a template is missing. This causes Controller::$helpers to be reset with
default values.
2012-06-01 15:28:06 +07:00
Rachman Chavik
483d7124dd
debug() may output path that is incorrectly truncated
...
This happens when debug is called in core source files that resides in
a different directory to the app.
2012-06-01 15:28:06 +07:00
mark_story
55c4ad3c1c
Fix coding standards errors.
...
Also remove count() calls in TreeBehavior.
2012-05-31 21:20:11 -04:00
Mark Story
085ad0bb42
Merge pull request #672 from sitedyno/cookie-encryption-#471
...
Add stronger encryption, and make it available in cookiecomponent.
Fixes #471
Fixes #176
Fixes #2043
Fixes #1524
2012-05-31 17:44:49 -07:00
Ceeram
6c9b2a1fec
Fix user() return value for nested data
2012-05-31 15:13:24 +02:00
Mark Story
119377422e
Merge pull request #674 from colares/ticket-2787
...
Add table attributes per column
Fixes #2787
2012-05-30 18:29:56 -07:00