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
173524ade2
PHP 5.4 strict error fix
2012-09-13 21:12:04 +01:00
euromark
288fb120b5
added missing App::uses('Hash', 'Utility');
2012-09-13 17:20:26 +02:00
dogmatic69
dc3995f939
Simplify the ClassRegistry by removing else, early returns
2012-09-13 14:00:51 +01:00
José Lorenzo Rodríguez
395e5bab58
Merge pull request #832 from dogmatic69/cake-time-unused-var
...
adding the timezone as it was not being used
2012-09-13 00:10:22 -07:00
ADmad
c4458a9e72
Merge pull request #830 from dogmatic69/string-code-format
...
fixing the missing space on the if
2012-09-12 23:41:23 -07:00
dogmatic69
cf361040a4
adding the timezone as it was not being used
2012-09-13 06:45:44 +01:00
dogmatic69
b1db2aeb31
fixing the missing space on the if
2012-09-13 06:24:36 +01:00
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
AD7six
99b798fa9a
make it possible to override all of basics.php
2012-09-06 10:19:06 +02: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
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
mark_story
f155687cfa
Update version number to 2.2.2
2012-09-01 18:28:03 +01:00
mark_story
21a51a374a
Revert "Make test a bit more solid."
...
This reverts commit 072991d0da
2012-09-01 14:43:11 +01:00
mark_story
072991d0da
Make test a bit more solid.
2012-09-01 14:34:10 +01:00
mark_story
571c8bc08c
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/Task/TestTask.php
2012-09-01 13:51:40 +01:00
mark_story
474e42cc08
Switch File::info() tests to use a different file.
...
text/php files are not detected reliably across platforms. Use a plain
text file instead. This should fix builds on travis.ci
2012-09-01 12:40:05 +01:00
mark_story
d3105332dc
Fix coding standards errors.
2012-09-01 12:14:15 +01:00
mark_story
e8b5d81fd7
Fix quoting of field names containing -.
...
Fixes #3165
2012-08-31 14:25:02 +01:00
ADmad
3e17c7aef9
Merge pull request #807 from kamui545/master
...
Fix typo
2012-08-30 23:59:10 -07:00
Maggion Emmanuel
03f6f041b2
Fix typo
2012-08-31 09:50:22 +03:00
