dogmatic69
|
f886d874a6
|
simplify the code in the string class
removing else statements and variables that are not needed.
eg: return something(); vs $foo = something(); return $foo;
|
2012-09-12 18:10:50 +01:00 |
|
mark_story
|
6664acba79
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/VERSION.txt
|
2012-09-05 20:15:36 -04:00 |
|
Kyle Robinson Young
|
a214fcd992
|
Remove never reached code in Debugger::trimPath and test more results
|
2012-09-05 15:57:53 -07:00 |
|
Kyle Robinson Young
|
200dd2dc9b
|
Code standards fixes, unneeded break statements
|
2012-09-04 11:30:52 -07:00 |
|
mark_story
|
728300786b
|
Merge branch 'master' into 2.3
|
2012-08-30 19:43:11 +01:00 |
|
Ber Clausen
|
63548267e9
|
Refactor Validator::decimal() to be more flexible with decimal
separators and PHP magic.
Lots of testing added.
|
2012-08-27 23:25:17 -03:00 |
|
mark_story
|
b68a2ed84d
|
Update API docs.
|
2012-08-26 22:15:18 -04:00 |
|
mark_story
|
d66d37c92b
|
Merge branch 'master' into 2.3
|
2012-08-24 22:50:29 -04:00 |
|
Ber Clausen
|
b75a6b440a
|
Treat float numbers with trailing zeroes removed by PHP, accordingly.
Revert #2800 (28bd6880df ) regex changes. Also add more tests.
Signed-off-by: mark_story <mark@mark-story.com>
|
2012-08-24 22:22:12 -04:00 |
|
mark_story
|
24b68ec1db
|
Ensure = is removed from generated salt values.
|
2012-08-24 09:35:33 -04:00 |
|
euromark
|
7969062614
|
legacy support with test cases
|
2012-08-17 13:57:47 +02:00 |
|
euromark
|
f201684873
|
use html ellipsis if possible (only a single char and therefore does not line break or mess up the strlen count for length)
|
2012-08-17 13:31:01 +02:00 |
|
Mark Story
|
9e96c473f4
|
Merge pull request #752 from dereuromark/2.3-truncate-tail
String::tail()
|
2012-08-16 11:02:06 -07:00 |
|
mark_story
|
4487673060
|
Merge branch 'master' into 2.3
|
2012-08-09 20:43:47 -04:00 |
|
mark_story
|
b29cc6a9b6
|
Try again at fixing errors in 5.2
|
2012-08-08 23:09:44 -04:00 |
|
mark_story
|
c94a684be8
|
Try to fix recursion issues in PHP5.2.
|
2012-08-08 22:42:44 -04:00 |
|
mark_story
|
dca050fbd6
|
Fix errors with recursion in debug()
Fixes #3102
|
2012-08-08 22:30:27 -04:00 |
|
mark_story
|
57c495f53a
|
Enabled Debugger::exportVar() to display private & protected properties.
This will only work in PHP >= 5.3. Patch originally created
by 'dereuromark'.
|
2012-08-06 13:32:52 -04:00 |
|
euromark
|
2a570e639c
|
ellipsis instead of ending/beginning for core wide consistency
|
2012-08-04 19:58:23 +02:00 |
|
euromark
|
853fa7d95b
|
doc block correction
|
2012-08-03 10:54:16 +02:00 |
|
euromark
|
917d912a43
|
String::tail()
|
2012-08-02 13:21:31 +02:00 |
|
mark_story
|
d94cdc67fe
|
Merge branch 'master' into 2.3
|
2012-07-27 22:38:24 -04:00 |
|
mark_story
|
7d74f3e598
|
Increase context depth in error messages.
Fixes #3063
|
2012-07-24 23:39:48 -04:00 |
|
mark_story
|
70c714d600
|
Fix incorrect context being used for excerpt.
Fixes #3064
|
2012-07-24 23:37:37 -04:00 |
|
mark_story
|
2359fb7e2e
|
Simplify number formatting.
|
2012-07-22 21:28:49 -04:00 |
|
Heath Nail
|
434d3a7137
|
Add bcrypt support to Security::hash()
|
2012-07-22 21:15:00 -04:00 |
|
mark_story
|
468302b526
|
Merge branch 'master' into 2.3
|
2012-07-21 20:59:56 -04:00 |
|
U-Zyn Chua
|
e7c4064a69
|
Fix URL validation to allow underscores in subdomain.
|
2012-07-19 20:51:33 +08:00 |
|
mark_story
|
3c6b50953b
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/VERSION.txt
|
2012-07-18 22:12:51 -04:00 |
|
euromark
|
3945c0e6a8
|
rtim files
|
2012-07-18 03:55:29 +02:00 |
|
mark_story
|
6c905411ba
|
Fix XML decoding attack via external entities.
|
2012-07-14 11:53:37 -04:00 |
|
ADmad
|
76f93178a8
|
Tweaked Validation::extension()
|
2012-06-25 19:15:52 +05:30 |
|
mark_story
|
3f78216e96
|
Revert changes in behavior made to timeAgoInWords()
Changes made in [0729aca706 ] changed
the generated text to not match the behavior in 2.1.
|
2012-06-24 20:54:47 -04:00 |
|
Juan Basso
|
ecdf0e6c6c
|
Optimization for Hash method
|
2012-06-24 12:47:30 -04:00 |
|
Jelle Henkens
|
db7d5426ec
|
CakeTime no longer sets the timezone out of its scope on the date object
|
2012-06-24 11:10:55 +01:00 |
|
Ceeram
|
03e2263b69
|
Merge branch '2.1' into 2.2
|
2012-06-19 18:35:36 +02:00 |
|
mark_story
|
001e89bf3f
|
Fix formatting with locales using , as decimal separator
Fixes #2958
|
2012-06-18 23:13:09 -04:00 |
|
Ceeram
|
74a0bd98c2
|
throw exception in Validation::mimeType() if PHP has nothing to provide the mimetype
|
2012-06-14 19:01:41 +02:00 |
|
mark_story
|
76dd49145a
|
Merge branch '2.1' into 2.2
|
2012-06-10 20:34:20 -04:00 |
|
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
|
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 |
|
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 |
|
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 |
|
mark_story
|
01b3135a63
|
You should be able to regex match null/''
Fixes #2926
|
2012-05-30 21:28:18 -04:00 |
|