mark_story
0ed9e3c120
Only bake HABTM associations for tables that exist.
...
bake often guesses wrong when it comes to habtm. Only add associations
we're highly confident of. This includes tables where the foreign table
also exists.
Refs #3532
2013-01-15 21:43:30 -05:00
mark_story
ad0d6644c4
Partially revert default niceShortFormat
...
In 9fa531d6e3
the default niceShortFormat
was changed, which has been interpreted as a regression in #3533 .
This change partially reverts the previous change and tries to strike
a balance between the old behavior and new.
Refs #3533
2013-01-14 21:12:11 -05:00
mark_story
eff4004261
Don't treat tables that substring match as associations
...
The table structure of:
- packages
- userpackages
- georegions
- userpackages_georegions
Should not create a habtm between packages & georegions.
Fixes #3532
2013-01-14 20:39:01 -05:00
mark_story
9c29fab4a4
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Network/Http/HttpResponse.php
2013-01-14 20:24:56 -05:00
Mark Story
a1035f720e
Merge pull request #1072 from uzyn/httpresponse-3531
...
Add OK or Successful HTTP codes 200-206 to HttpResponse::isOK().
Fixes #3531
2013-01-14 17:22:18 -08:00
U-Zyn Chua
bcdbdc8108
Add OK or Successful HTTP codes 200-206 to HttpResponse::isOK(). Fixes #3531
2013-01-15 09:17:24 +08:00
euromark
19cfe40fd1
fix return type in docblock
2013-01-12 16:26:44 +01:00
ADmad
d5ddaa4cb7
Added missing keyword
2013-01-12 11:30:25 +05:30
ADmad
d6c2df7b6b
Display exact PDO error on default homepage
2013-01-12 11:30:25 +05:30
ADmad
d8551c49e5
Improve messages logged for exceptions
2013-01-12 11:30:25 +05:30
ADmad
676872d623
Allow AuthComponent::$unauthorizedRedirect to be an url.
...
Closes #3494
2013-01-12 11:25:13 +05:30
Mark Story
e7330fa585
Merge pull request #1067 from ceeram/paginatecount
...
Avoid calling paginateCount when there are no results.
2013-01-11 18:09:32 -08:00
José Lorenzo Rodríguez
d571b056f4
Merge pull request #1063 from ADmad/2.3-cakeplugin
...
Added feature to ignore include errors for CakePlugin
2013-01-11 15:13:54 -08:00
Mark Story
1a699ee1ce
Merge pull request #1071 from dogmatic69/currency-format
...
'0.0' and 0 should be formatted consistent.
Fixes #3525
2013-01-11 10:49:09 -08:00
dogmatic69
bcb3eb89dc
Before this change 0.00 and '0.00' are treated differently. Floats from the database are returned as the string
...
version while doing calculations will normally end up as floats.
This causes output differences on pages like order totals or invoices where there is a mix of calculated values
and database values.
Number::currency(0.00, 'GBP') -> £0.00
Number::currency('0.00', 'GBP') -> 0p
Both versions will return `£0.00` (or whatever 0 is configured to return).
2013-01-11 17:00:06 +00:00
Mark Story
ead469fff3
Merge pull request #1070 from dereuromark/2.3-cleanup
...
fix doc block endings
2013-01-11 06:40:16 -08:00
euromark
11a88042bd
fix doc block endings
2013-01-11 15:06:54 +01:00
José Lorenzo Rodríguez
6e4d522a02
Merge pull request #1069 from radig/master
...
Ensure $sources is Array ( fix #3520 )
2013-01-11 05:25:56 -08:00
Cauan Cabral
099ca310e2
Ensure $sources is Array before use
2013-01-11 10:14:05 -03:00
Ceeram
92d9b11aee
fix double semicolon
2013-01-11 11:15:15 +01:00
Ceeram
d3f9cc10b5
fix failing test
2013-01-10 18:10:24 +01:00
Ceeram
88240b2874
avoid paginate count when no results
2013-01-10 16:39:07 +01:00
mark_story
7008b812be
Fix string '0' not being exported correctly.
...
Fixes #3518
2013-01-09 23:04:58 -05:00
mark_story
735517ade1
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2013-01-08 22:27:17 -05:00
mark_story
e3692225ff
Fix lint errors.
2013-01-08 22:26:43 -05:00
mark_story
d21a621972
Update version number to 2.3.0-RC2
2013-01-08 21:51:52 -05:00
mark_story
5dede3879f
Update version number to 2.2.5
2013-01-08 21:48:59 -05:00
mark_story
d0d13acaf4
Merge branch 'master' into 2.3
2013-01-08 20:15:46 -05:00
mark_story
11485b6d67
Merge branch 'bbcrew-master'
...
From pull/1062 reset data arrays when expanding to solve
infinite recursion issues in PHP5.2
Fixes #3080
2013-01-08 19:42:23 -05:00
mark_story
c2e087dc9b
Add test for recursion issues in Hash::expand().
...
Refs #3080
2013-01-08 19:42:12 -05:00
ADmad
970fdca89d
Added feature to ignore include errors for CakePlugin
2013-01-09 01:08:42 +05:30
Mark Story
0b43a5c05a
Merge pull request #1061 from dereuromark/2.3-cache-engine
...
Assert that the cache does not silently fail
Choosing an invalid cache engine should not be a silent error.
2013-01-08 09:23:11 -08:00
euromark
a266d8bede
add test case
2013-01-08 13:06:02 +01:00
Marco Tisi
8af76a5662
Closes ticket #3080 in CakePHP Lighthouse ( http://cakephp.lighthouseapp.com/projects/42648/tickets/3080-hashflatten-endless-loop-on-single-0-int-keys ).
...
Hash::flatten has a bug which causes an endless loop when try to flatten an integer key.
Probably the $data array pointer won't reset itself when doing:
$data = $element
and
list($data, $path) = array_pop($stack)
The solution is to reset the pointer after the assignments.
2013-01-08 11:49:52 +01:00
mark_story
3f21d09c1d
Fix radio() and boolean values.
...
Boolean values should be cast to integer equivalents, which allows
for correct handling of boolean columns and their string equivalents
used in form options.
Fixes #3512
2013-01-07 21:12:53 -05:00
mark_story
e132a7c856
Remove duplicated assertions.
...
These assertions are effectively duplicated in the next test method.
2013-01-07 21:00:14 -05:00
euromark
05167a6420
assert that the cache does not silently fail
2013-01-07 13:43:21 +01:00
AD7six
967526540a
app/Console/cake is not pwd sensitive
...
the app dir does not need to be guessed based on the pwd - derive
from the path to the executable
2013-01-06 22:09:07 +01:00
mark_story
ac1f64abc9
Start and end transactions on the fixtures datasource.
...
Fixes #3490
2013-01-05 14:50:09 -05:00
mark_story
6d743971e9
Consistently inflect theme names.
...
Themes should be consistently converted into CamelCase, this
makes the camelization consitent with the treatment in App::themePath().
Fixes #3508
2013-01-03 21:06:46 -05:00
mark_story
75f654b87b
Fix double encoding in JsHelper request methods.
...
The urls were being HTML & URL encoded, this causes issues with URL's
containing query string parameters. Remove HTML entities as they aren't
required in the Javascript context.
Fixes #3495
2013-01-02 23:09:37 -05:00
Mark Story
a949988208
Merge pull request #1055 from and-ers/master
...
Optimize and switch array_push() for [] =
2013-01-02 17:41:35 -08:00
and-ers
c72c612625
Replaced simple and therefore pointless array_push function references with the ordinary way of adding an array element. This will increase the performance and the code looks much cleaner this way IMHO
2013-01-02 23:47:27 +01:00
ADmad
ea3fa67c79
Added new html5 boolean attributes
2013-01-02 12:15:58 +05:30
mark_story
659715664d
Check for the methods that will be called.
...
Check the same methods that are called. Without this diffs are not
printed for failures.
Fixes #3503
2013-01-01 14:25:34 -05:00
Mark Story
2e4bde017e
Merge pull request #1054 from chronon/2.3
...
Updating version number in test suite header.
2012-12-30 17:12:35 -08:00
Gregory Gaskill
b6b40b1196
Updating version number in test suite header.
2012-12-30 13:50:05 -08:00
mark_story
83abced287
Add tests for save() and multiple locales.
...
Refs #3498
2012-12-29 11:57:52 -05:00
mark_story
4c98e39c1f
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Controller/Component/SecurityComponent.php
2012-12-29 11:44:59 -05:00
mark_story
1117ad2f1c
Blackhole requests when the action is the blackhole callback.
...
When a user requests the blackhole callback as an action we should
blackhole that request. The blackhole callback should not be URL
accessible.
Fixes #3496
2012-12-29 11:43:06 -05:00