Mark Story
25b447149d
Merge pull request #827 from dogmatic69/simplify-object-collection
...
simplify the code for object collection
2012-09-12 18:36:28 -07:00
Mark Story
5d8ca79b00
Merge pull request #825 from dogmatic69/sanitize-simplify-code
...
Simplify the code for sanitize class
2012-09-12 18:23:10 -07:00
Mark Story
5ddb61be92
Merge pull request #829 from dogmatic69/string-simplify-code
...
this change did make wonky uuids
2012-09-12 18:13:14 -07:00
dogmatic69
b84224804e
that change did make wonky uuids
2012-09-12 23:52:04 +01:00
dogmatic69
91c09d87bc
simplify the code for object collection
...
Fixed up some abreviated variables, removing extra long lines and removed
variables that were not used.
2012-09-12 21:56:59 +01:00
dogmatic69
44f8f84cd7
Simplify the code for sanitize class
...
removing else statements and variables that are not needed.
eg: return something(); vs $foo = something(); return $foo;
2012-09-12 21:29:40 +01:00
Mark Story
0d7db89a43
Merge pull request #824 from dogmatic69/string-simplify-code
...
simplify the code in the string class
2012-09-12 11:49:40 -07:00
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
José Lorenzo Rodríguez
b227ff486e
Merge pull request #822 from rchavik/2.3
...
enable PluginDot for routeClass parameter
2012-09-12 08:04:44 -07:00
Rachman Chavik
0cae19a14e
enable PluginDot for routeClass parameter
2012-09-12 21:24:56 +07:00
mark_story
99a9cc9669
Fix required field detection.
...
Fix required field detection to match documentation and behavior when
validating. Having `allowEmpty` in the first validation rule, makes the
field not 'required' as the field is allowed to be empty.
Fixes #3194
2012-09-11 21:59:46 -04:00
mark_story
2bbf6bd568
Forward model option to PaginatorHelper::link().
...
Fixes #3193
2012-09-11 21:47:41 -04:00
euromark
2d9d400ecb
correct spelling
2012-09-10 23:08:14 +02:00
euromark
f7acab7cae
doc block update
2012-09-10 19:20:15 +02:00
euromark
37068539bd
allow Folder to merge recursivly and add scheme option
2012-09-10 10:23:52 +02:00
Ceeram
ce1b387de2
fix incorrect docblock
2012-09-10 09:17:29 +02:00
mark_story
4f637ed4c4
Revert "Fix failing tests in PHPUnit 3.7.0-RC2"
...
This reverts commit d26040e3aa
.
This change causes tests to fail in PHPUnit 3.6, this will have to wait
until 3.7.0 stable.
2012-09-09 21:36:33 -04:00
mark_story
d26040e3aa
Fix failing tests in PHPUnit 3.7.0-RC2
2012-09-09 21:25:53 -04:00
mark_story
e8c1140fc8
Fix notice error.
2012-09-09 21:08:21 -04:00
mark_story
a934f700f1
Fix parsing '0' as a url.
...
Fixes #3198
2012-09-09 20:56:40 -04:00
Jose Lorenzo Rodriguez
9ac5cbed36
Added MailTransport test class refs #2824
2012-09-09 15:48:14 +02:00
Mark Story
261b6b01e8
Merge pull request #819 from ceeram/2.2-cookie
...
remove cookie reading in startup
2012-09-06 18:50:57 -07:00
Ceeram
0b0d83f261
remove cookie reading in startup
2012-09-07 00:04:03 +02:00
AD7six
99b798fa9a
make it possible to override all of basics.php
2012-09-06 10:19:06 +02:00
Mark Story
93004fcf2f
Merge pull request #818 from shama/patch-unused-vars
...
Remove unused variables and code
2012-09-05 17:50:06 -07:00
Mark Story
c8cb3ae75f
Merge pull request #810 from schrolli/patch-2
...
Update lib/Cake/Configure/IniReader.php
2012-09-05 17:45:43 -07:00
Kyle Robinson Young
bc40ac7d3f
Remove unused variables and code
2012-09-05 17:19:13 -07:00
mark_story
6664acba79
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-09-05 20:15:36 -04:00
Mark Story
878f18419c
Merge pull request #817 from shama/patch-trimpath
...
Remove never reached code in Debugger::trimPath and test more results
2012-09-05 17:12:23 -07:00
Kyle Robinson Young
a214fcd992
Remove never reached code in Debugger::trimPath and test more results
2012-09-05 15:57:53 -07:00
Mark Story
f1c2b1fba8
Merge pull request #816 from shama/patch-email-component
...
Fix $readReceipt variable in EmailComponent::send
2012-09-05 14:59:19 -07:00
Kyle Robinson Young
602240c08e
Fix $readReceipt variable in EmailComponent::send
2012-09-05 12:49:09 -07:00
mark_story
c7647b775f
Attempt to fix build error in travis.
2012-09-04 17:25:02 -04:00
Mark Story
f6b1d08f02
Merge pull request #814 from shama/patch-cs
...
Code standards fixes: removing unneeded break statements
2012-09-04 14:12:22 -07:00
Kyle Robinson Young
200dd2dc9b
Code standards fixes, unneeded break statements
2012-09-04 11:30:52 -07:00
ADmad
28951865c6
Hidden divs created by FormHelper can now be customized.
2012-09-04 23:56:30 +05:30
mark_story
5b641287e9
Make schema errors clearer.
...
When a schema fails because of the name, the error should display
the name & file name that it attempted to load. This gives people
a slightly better chance of figuring things out.
2012-09-03 21:06:48 -04:00
mark_story
0d826528e1
Supress fewer errors.
...
PHPUnit raises exceptions on errors, there isn't much point in
supressing all these errors.
2012-09-03 20:13:30 -04:00
mark_story
771cfde196
Fix coding standards.
2012-09-03 20:09:13 -04:00
mark_story
bacd8afde3
Remove duplicated header.
2012-09-03 19:55:29 -04:00
euromark
2170d87488
check() for CookieComponent and Configure (similar to CakeSession::check()
)
2012-09-04 01:04:48 +02:00
Mark Story
eb33929829
Merge pull request #731 from dereuromark/2.3-fix-rss-test
...
2.3 fix rss test
2012-09-03 15:03:44 -07:00
mark_story
3cb501f1c5
Fix issue created in [ e8b5d81fd7
]
...
Query conditions with `-` and no surrounding spaces were quoted
incorrectly.
Fixes #3178
2012-09-03 13:24:38 -04:00
mark_story
583bb37df0
Fix typo.
2012-09-03 13:10:27 -04:00
ADmad
a392892756
Merge pull request #812 from dereuromark/2.3-mediaview
...
Remove redundant prefixing of APP to path. It's already done in CakeResponse::file()
2012-09-03 05:39:02 -07:00
euromark
387a974396
avoid path being made absolute twice
2012-09-03 13:16:40 +02:00
Mark Story
a1edede41e
Merge pull request #811 from brq/2.3
...
Allow postLink() to support other HTTP methods; it defaults to POST
2012-09-02 11:06:47 -07:00
brq
fca98e39f9
Allow postLink() to support other HTTP methods; it defaults to POST
2012-09-02 12:57:35 -05:00
schrolli
83c05c24b3
Update lib/Cake/Configure/IniReader.php
...
Updated docblock and set NULL as the default value of $path
2012-09-02 14:23:26 +03:00
schrolli
a4c382b23a
Update lib/Cake/Configure/IniReader.php
...
Copied standard path from PhpReader
2012-09-02 06:02:30 +03:00