José Lorenzo Rodríguez
d999a83250
Merge pull request #835 from tigrang/default-block-value
...
Added ability to set default view block content
2012-09-18 00:59:27 -07:00
Tigran Gabrielyan
d30e092966
Fixed test case
2012-09-18 00:46:06 -07:00
Tigran Gabrielyan
f1a344eee4
Added test case for view block default value
2012-09-18 00:41:33 -07:00
Tigran Gabrielyan
6d98069f13
Added ability to set default view block content
2012-09-18 00:41:30 -07:00
Ceeram
90c32add9c
opmitisation of fromReadableSize
2012-09-18 09:34:05 +02:00
Mark Story
07c5102de5
Merge pull request #850 from ceeram/2.2-filesize
...
Add CakeNumber::fromReadableSize() and Validation::filesize()
2012-09-17 17:55:23 -07:00
mark_story
55dcb9c3b3
Implement resetSequence()
...
This is an optional method in DboSource that allows datasources to
resetSequence values in tables. This is useful for datasources like
Postgres, and makes using fixtures much easier.
Fixes #3026
2012-09-17 20:50:05 -04:00
Ceeram
9530e68ae6
add default return value as parameter to use when size can not be determined
2012-09-17 13:21:50 +02:00
Mark Story
cdfead0feb
Merge pull request #849 from dogmatic69/rijndael-fatal-error
...
skipping the rijndael test if mcrypt_encrypt() is not available
2012-09-15 18:00:07 -07:00
Mark Story
7f76f70287
Merge pull request #848 from dogmatic69/removing-alias-function-calls
...
Removing alias function calls
2012-09-15 17:59:03 -07:00
dogmatic69
26934236b1
skipping the rijndael test if mcrypt_encrypt() is not available
2012-09-15 11:43:39 +01:00
dogmatic69
d0bb8a94b4
die() to exit()
2012-09-15 11:20:51 +01:00
dogmatic69
4899b5b91b
changing is_writeable() to is_writable()
2012-09-15 11:17:35 +01:00
dogmatic69
aa87791432
replacing is_integer() with is_int()
2012-09-15 11:15:01 +01:00
dogmatic69
a38a616cba
changing join() to implode() for consistency
2012-09-15 11:06:02 +01:00
mark_story
ccd33782da
Fix whitespace errors.
2012-09-14 22:37:39 -04:00
mark_story
d6e2b6f83e
Re-format long lines.
2012-09-14 22:08:52 -04:00
Mark Story
89c98233b5
Merge pull request #843 from dereuromark/2.3-ticket-3172
...
check() for CookieComponent and Configure
2012-09-14 18:22:34 -07:00
euromark
6d3e0a25b2
save some memory usage (PHP < 5.4) in case of huge content and cut off the isset call
2012-09-15 02:33:05 +02:00
Mark Story
a5481f1c2c
Merge pull request #839 from dogmatic69/cleanup-request-handler
...
Cleaning up the RequestHandlerCompoent
2012-09-14 12:36:39 -07:00
dogmatic69
f5a8eb6bbf
ADmads comments
2012-09-14 19:57:51 +01:00
dogmatic69
cfadc4dbb0
strict type checks and removing some duplicate count() calls by setting a variable
2012-09-14 19:26:00 +01:00
dogmatic69
5cc03ca805
converting if($foo == true) to if($foo)
2012-09-14 18:54:29 +01:00
dogmatic69
22a2e1b51e
converting $foo == / $foo == 0 to !$foo (and a few $foo === 0)
2012-09-14 18:42:25 +01:00
dogmatic69
cf8fccae96
converting $foo == null / $foo == false to !$foo
2012-09-14 18:26:30 +01:00
dogmatic69
e09bf02467
Cleaning up the RequestHandlerCompoent
...
removing redundant code and shifting a few things around so there
are less nested ifs and making things easier to follow.
Removing some variable setting, returning function calls instead.
2012-09-14 17:19:40 +01:00
Mark Story
ec4333de29
Merge pull request #845 from dogmatic69/security-component-cleanup
...
You cant pass func_get_args() in PHP < 5.3
2012-09-14 08:17:11 -07:00
Mark Story
98992e021a
Merge pull request #844 from dogmatic69/form-bug
...
Adding a check to the object before use
2012-09-14 08:16:40 -07:00
dogmatic69
c7faad9f78
You cant pass func_get_args() in PHP < 5.3
2012-09-14 15:29:48 +01:00
dogmatic69
6f3e6c10a1
Adding a check to the object before use
...
For some reason that I have not been able to figure out yet the object is
returned as null. This is causing some exceptions when trying to access
properties that dont exist.
FatalErrorException: "Call to a member function getAssociated() on a non-object"
Test still pass with the added check.
2012-09-14 14:54:10 +01:00
mark_story
0282194c20
Make permission denied redirects host relative.
...
This helps fix infinite redirect loops when HTTP_X_FORWARDED_HOST is
set, and fixes redirects back to external domains on authentication
errors.
Fixes #3207
2012-09-14 09:39:45 -04:00
Renan Gonçalves
d33f676ddd
Handling a fatal error on console should call Shell::_stop(1).
...
Just like we do on web, any exception or fatal error will result into a InternalErrorException/FatalErrorException.
2012-09-14 14:17:07 +02:00
mark_story
7d2cbec79d
Revert "Fix null not stopping model callbacks."
...
This reverts commit 82a8400def
2012-09-13 22:49:17 -04:00
mark_story
82a8400def
Fix null not stopping model callbacks.
...
Add a compatibility shim into CakeEventManager to fix `null` not
breaking model callbacks. This was a regression created when model
callbacks were re-factored to use the event manager. This code should be
removed in 3.x as its inconsistent with events used everywhere else in
the framework.
Fixes #3123
2012-09-13 22:11:46 -04:00
Mark Story
1fe791353f
Merge pull request #840 from dogmatic69/cleanup-auth-component
...
Cleaning up the AuthComponent
2012-09-13 18:21:51 -07:00
mark_story
c13ed3366b
Fix whitespace errors.
2012-09-13 21:06:14 -04:00
Mark Story
5081be171f
Merge pull request #821 from dereuromark/2.3-folder-merge
...
allow Folder to merge recursivly and add scheme option
2012-09-13 18:00:02 -07:00
mark_story
921c2c67ab
Fix strict error in 5.4
2012-09-13 20:59:17 -04:00
dogmatic69
2c70319d27
Cleaning up the AuthComponent
...
Simplify if statements, return early and less variable use
2012-09-14 01:50:24 +01:00
mark_story
ec54fa57c5
Merge branch 'simplify-cake-time' into 2.3
...
Conflicts:
lib/Cake/Utility/CakeTime.php
2012-09-13 20:45:59 -04:00
Mark Story
51e0715001
Merge pull request #838 from dogmatic69/security-component-cleanup
...
cleaning up the code, removing extra variables set and un-needed else
2012-09-13 14:50:37 -07:00
Mark Story
f22d4c016e
Merge pull request #837 from dogmatic69/paginator-component-cleanup
...
Cleaning up the paginator component by removing extra else statements and shifting code around.
2012-09-13 14:48:33 -07:00
Mark Story
31ca237709
Merge pull request #831 from dogmatic69/sanitize-regex-cleanup
...
adjusting the way the regex is done so its easier to read
2012-09-13 14:41:36 -07:00
Mark Story
0f8262ec45
Merge pull request #833 from dogmatic69/simplify-class-registry
...
Simplify the ClassRegistry by removing else, and adding early returns
2012-09-13 14:39:37 -07:00
Mark Story
051362a734
Merge pull request #836 from dogmatic69/simplify-object-collection
...
PHP 5.4 strict error fix
2012-09-13 14:37:40 -07:00
Mark Story
c7da60de08
Merge pull request #834 from dereuromark/2.3-missing-appuses
...
added missing App::uses('Hash', 'Utility');
2012-09-13 14:37:05 -07:00
dogmatic69
95b895b19a
Simplify the cake time class
...
Removed a lot of nested ?: code and nested if/else statements broken down
with early return. Moving a few variables lower down the function calls as
there are times when they are not even needed.
Also removed setting variables that are returned on the next line.
2012-09-13 22:17:01 +01:00
dogmatic69
bf18fc4dda
cleaning up the code, removing extra variables set and un-needed else
2012-09-13 22:10:57 +01:00
dogmatic69
eb98fed1e3
Cleaning up the paginator component by removing extra else statements and shifting code around.
2012-09-13 21:49:21 +01:00
dogmatic69
173524ade2
PHP 5.4 strict error fix
2012-09-13 21:12:04 +01:00
