euromark
738b34c2d0
Correct assert param order
2014-01-09 16:50:27 +01:00
Mark Story
7f2e0a29a4
Merge pull request #2624 from dereuromark/2.5-loggedin
...
2.5 loggedin
2014-01-07 11:27:39 -08:00
euromark
e3befe30df
deprecated loggedIn
2014-01-07 16:12:38 +01:00
Mark Story
cd9c135c88
Merge pull request #2601 from dereuromark/2.5-upgrade
...
2.5 upgrade
2014-01-07 06:43:10 -08:00
euromark
483cd13a26
rename method
2014-01-06 20:00:45 +01:00
ADmad
18255bdcf3
Fixed typo in var name.
2014-01-06 02:32:34 +05:30
mark_story
5fd8883691
Merge branch 'master' into 2.5
2014-01-05 15:45:09 -05:00
Mark Story
7e084da6e8
Merge pull request #2594 from dereuromark/2.5-error-handling
...
2.5 error handling
2014-01-05 08:00:39 -08:00
euromark
3e48d2e082
Add return early statements for redirecting in controllers.
2014-01-04 13:18:14 +01:00
euromark
71fb17e092
keep name as well
2014-01-03 16:33:02 +01:00
euromark
85337a5d15
correct templates
2014-01-03 13:28:45 +01:00
euromark
a02ab67521
unify exception and error handling.
2014-01-03 12:42:52 +01:00
ADmad
cfa104577f
Merge pull request #2593 from dereuromark/master-hotfix
...
Correct casing.
2014-01-03 03:41:11 -08:00
euromark
3d51bfee3b
Correct casing.
2014-01-03 04:09:19 +01:00
mark_story
3cee3b0e99
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-12-30 21:28:22 -05:00
Mark Story
4ae1feaf2d
Merge pull request #2571 from cuppett/patch-1
...
Must double quote the schema name in query
2013-12-30 08:18:22 -08:00
ADmad
f37eb9ad4b
Merge pull request #2572 from bcrowe/hotfix-controllerBlocks
...
Update some grammar in Controller
2013-12-29 21:30:01 -08:00
Bryan Crowe
49bb441cef
Update some grammar in Controller
2013-12-30 00:13:26 -05:00
mark_story
85d72443b6
Remove ext-mbstring dependency.
...
mbstring is not a hard dependency for 2.x. The Multibyte class can shim
up the missing extension.
Refs #2564
2013-12-29 23:49:17 -05:00
Mark Story
107f883223
Merge pull request #2570 from dereuromark/master-pkpass
...
Add missing pkpass mimetype
2013-12-29 20:36:08 -08:00
Stephen Cuppett
ed749fdc97
Must double quote the schema name in query
...
Schema names with reserved words such as "create" will fail this query without double quotes.
Attempted prepared statement with ? placeholder. This failed with the following CakePHP error:
Error: A Database connection using "Postgres" was missing or unable to connect.
The database server returned this error: SQLSTATE[42601]: Syntax error: 7 ERROR: syntax error at or near "$1" LINE 1: SET search_path TO $1 ^
2013-12-29 21:43:56 -05:00
euromark
2f02d0c755
Add missing pkpass mimetype
2013-12-30 01:19:09 +01:00
Mark Story
b728bced73
Merge pull request #2564 from josegonzalez/master
...
Added composer.json for CakePHP 2.x
2013-12-28 16:08:03 -08:00
Jose Diaz-Gonzalez
c86f9ab3e5
Added composer.json for CakePHP 2.x
2013-12-28 18:24:22 -05:00
Mark Story
b682732c1e
Merge pull request #2557 from rchavik/2.4-save-tree-invalid-scope
...
2.4 save tree invalid scope
2013-12-27 07:17:52 -08:00
Rachman Chavik
c4f8289b53
Fix test by checking against an empty array instead of false
2013-12-27 12:37:39 +07:00
Rachman Chavik
c48afae2dc
Add test to prove issue when saving invalid tree data
2013-12-27 12:35:28 +07:00
mark_story
1daa27c0d7
Add tests for uncovered case of :0 replacements.
...
There were previously no tests for the :0, :1 style replacement markers
in DboSource. In fact I didn't even know it was a 'feature'.
2013-12-24 13:13:05 -05:00
Mark Story
1cb7e4f0ff
Merge pull request #1635 from dereuromark/master-dom-ids
...
Fix duplicate ID generation of for multiple checkboxes.
2013-12-24 07:02:38 -08:00
euromark
b392254c92
fix cs
2013-12-24 15:20:32 +01:00
mark_story
af9611d460
Update version number to 2.4.4
2013-12-23 21:44:46 -05:00
mark_story
99e4dbd827
Merge branch 'master' into 2.5
2013-12-23 11:58:07 -05:00
mark_story
70530135d6
Don't use FORWARDED_HOST when getting referer values.
...
HTTP_X_FORWARDED_HOST is supposed to be used by proxies to indicate the
original HTTP_HOST value. It has nothing to do with referer values.
Since the HTTP_X_FORWARDED_HOST is intended to replace the HOST header
in proxied setups, add a trustProxy parameter to host() and default it
to false. This maintains existing behavior and allows people to access
the proxied value.
Fixes #2537
2013-12-23 11:32:14 -05:00
José Lorenzo Rodríguez
1aaa56575b
Merge pull request #2534 from zoghal/master-phpcs-error-fix
...
fix phpcs error "Missing @throws tag in function comment"
2013-12-23 00:41:00 -08:00
Saleh Souzanchi
328125ad43
Merge branch 'master' into master-phpcs-error-fix
2013-12-23 11:43:54 +03:30
Mark Story
321347e52b
Merge pull request #2532 from bar/patch-2
...
Trivial continue.
fix phpcs error "Missing @throws tag in function comment"
2013-12-23 11:21:18 +03:30
Mark Story
fb8472ae40
Merge pull request #2532 from bar/patch-2
...
Trivial continue.
2013-12-22 20:03:56 -08:00
Mark Story
d3b7fda961
Merge pull request #2531 from bar/patch-1
...
Parenthesis are preferred.
2013-12-22 20:03:09 -08:00
ber clausen
e0c85a18bc
Trivial continue.
2013-12-22 22:15:47 -02:00
ber clausen
4e70e44247
Parenthesis are preferred.
2013-12-22 22:10:37 -02:00
Mark
0142137d31
Merge pull request #2530 from bar/patch-1
...
Double rainbow.
2013-12-22 15:58:03 -08:00
ber clausen
98962806cd
Double rainbow.
2013-12-22 21:47:19 -02:00
Mark Story
4e55aa43f0
Merge pull request #2523 from bar/2.5-dbosource
...
Update documentation and typehint.
2013-12-21 18:30:44 -08:00
Ber Clausen
f30b43b4c9
Update documentation and typehint.
2013-12-21 22:02:45 -03:00
mark_story
62e89734ab
Throw exceptions from Hash::combine()
...
When the key + value counts do not match Hash should throw an exception.
Silently doing the wrong thing is generally not a good idea. While this
change could break existing applications, those applications were
probably behaving incorrectly anyways.
Fixes #2470
2013-12-21 17:46:05 -05:00
Mark Story
0c4a5c59e4
Merge pull request #2520 from bar/2.5-dbosource-read
...
Document and try to order part of ```DboSource```.
2013-12-21 14:04:29 -08:00
José Lorenzo Rodríguez
60d2ece035
Merge pull request #2506 from dereuromark/2.5-string
...
Correct tokenize for empty strings.
2013-12-21 10:31:52 -08:00
Ber Clausen
c15f7de164
Re-expose DboSource::fetchAssociated() for BC.
...
Internally use protected methods to fetch hasMany and hasAndBelongsToMany
associations.
2013-12-21 11:34:40 -03:00
Ber Clausen
5ccb77e25d
Be consistent with the result set variable name.
2013-12-21 10:57:40 -03:00
Ber Clausen
0adc062cfa
Process query only when needed.
2013-12-21 10:57:40 -03:00
