Commit graph

17911 commits

Author SHA1 Message Date
Mark
d415edb9e5 Merge pull request #2729 from joostdekeijzer/typo-in-comment
correct property comment
2014-01-29 03:30:09 -08:00
joostdekeijzer
827c815cf1 correct property comment 2014-01-29 12:25:09 +01:00
Rachman Chavik
b83b59a9d7 Log errors instead of calling trigger_error() 2014-01-29 17:51:07 +07:00
mark_story
d8134bdcf5 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/VERSION.txt
2014-01-26 15:26:47 -05:00
mark_story
9b4c2f3c86 Update version number to 2.4.5 2014-01-26 15:06:00 -05:00
ADmad
c093804b35 Merge branch 'master' into 2.5 2014-01-26 17:39:50 +05:30
ADmad
671bd9797b Merge pull request #2713 from GiampaoloFalqui/patch-1
Improves next() and prev() documentation
2014-01-26 03:58:19 -08:00
Giampaolo Falqui
ef08534460 Improves next() and prev() documentation
Adds the explanation for the URL available option, which is really useful when dealing with non-default CakePHP routes, now lacking from the official documentation.
2014-01-26 11:38:11 +01:00
mark_story
d7d8fc00d1 Check data with isset() before accessing it.
Don't blindly access data that may not exist.

Fixes #2712
2014-01-25 22:15:47 -05:00
mark_story
cf16ae055f Remove pointless code.
After the changes in #2709 this code just heats the earth.
2014-01-25 22:13:42 -05:00
Mark Story
82aa048acc Merge pull request #2709 from MelvinRoss/url-fix
Fix double url decoding bug
2014-01-25 19:10:44 -08:00
Melvin.Ross@gmail.com
7f496fad94 _Trailing_ and $this->keys also do not need to be urldecoded. Both _trailing_ and $this->keys gets set in _writeRoute, which also makes the regex that used to create the array $route.
Any keys in $route that match [_trailing_] or any values in $this->keys are put there through the exection of preg_match. The URL is decoded before being passed to preg_match, which means the values
inside of [_trailing_]etc. have already been decoded.
2014-01-24 17:44:31 -06:00
Melvin.Ross@gmail.com
83f37e48a9 Fix typo that removed '$' from '$key' 2014-01-24 16:33:59 -06:00
Melvin.Ross@gmail.com
8d6814e63f Remove rawurldecode from the _parseArgs function in CakeRoute since urldecode is already called on the URL string in CakeRoute::parse() when creating the $route array that is passed to _parseArgs.
The result of the double urldecodes is parameters with meaningful '%' signs being stripped away on accident, and the web server reporting that the requested address doesn't exist.
2014-01-24 16:14:58 -06:00
José Lorenzo Rodríguez
ddf046a246 Merge pull request #2694 from bar/patch-3
Correctly remove routing url from query string.
2014-01-22 05:15:03 -08:00
ADmad
4407cdb010 Avoid code duplication. 2014-01-22 11:36:45 +05:30
mark_story
61dd1c3f9d Fix trailing whitespace. 2014-01-21 20:23:12 -05:00
Juan Basso
dae756c84a Added option to allowed headers 2014-01-21 15:31:05 -05:00
Ber Clausen
5b4121f643 Update tests. 2014-01-21 16:56:37 -03:00
ADmad
84932fcc4a Don't start a session if it's known to be empty.
If an app only reads/checks the session there's no need to start a
session to know that the read/checked session value is empty.

Fixes #1981
2014-01-22 01:17:16 +05:30
ber clausen
d241a06a65 Correctly remove routing url from query string.
It mostly happens when in nxing setups, because of location defined like:

try_files $uri $uri/ /app/webroot/index.php?$uri&$args;
2014-01-21 16:57:46 -02:00
Juan Basso
5d9d62ba57 Fixed doc description 2014-01-21 11:42:04 -05:00
Juan Basso
a8ea1c6b55 Fixed CS 2014-01-21 10:47:08 -05:00
Juan Basso
5af3da7fe6 Changed tests to support PHP 5.2 :( 2014-01-21 10:44:00 -05:00
Juan Basso
5d016a7dbf Fixed code for PHP 5.2 2014-01-21 09:55:11 -05:00
Juan Basso
ec7196013c Added support to cross origin requests 2014-01-21 09:44:49 -05:00
mark_story
b4e56c9989 Merge branch 'issue-2667'
Fixes #2667
2014-01-18 21:54:31 -05:00
mark_story
55e1619c59 Fix issue with find(count) and TranslateBehavior.
Fixes #2667
2014-01-18 21:54:09 -05:00
Rob McVey
7a27650297 Test case that demonstrates issue with count and Translate 2014-01-18 21:49:07 -05:00
mark_story
46eda802e5 Fix mising connection parameter to schema objects.
When calling create/update the created schema object should be passed
the current connection.

Fixes #2668
2014-01-16 17:19:22 -05:00
mark_story
75dd2ff1fb Merge branch 'master' into 2.5 2014-01-16 15:20:40 -05:00
José Lorenzo Rodríguez
8b5336ade1 Merge pull request #2654 from mouyang/2.5-responseCodes
allow additional status codes through constructor
2014-01-16 00:49:19 -08:00
Matthew Ouyang
0536e058f9 correct the option key
documentation fix
'statusCodes' instead of 'codes'
2014-01-16 00:09:21 -05:00
Mark Story
64e18558dd Merge pull request #2655 from mouyang/2.5-app-AllTests
add AllTestsTest for skeleton app
2014-01-15 09:22:06 -08:00
mark_story
f25e84f4fb Don't select year 0 when there are all 0's.
Year 0 is almost never a 'good' selection value and causes odd behavior
when paired with MySQL.

Fixes #2658
2014-01-15 10:23:45 -05:00
Matthew Ouyang
7b27b0d1ab add whitespace to end-of-file 2014-01-15 09:53:21 -05:00
Christian Winther
ace586e367 Merge pull request #2656 from makusu/fix-debugger-templates-array
fix multiple log array key definition on templates property in Debugger
2014-01-14 23:29:05 -08:00
Max Meiden Dasuki
9cc7c465d1 fix multiple log array key definition on templates property in Debugger 2014-01-15 15:14:00 +08:00
Matthew Ouyang
0661d7832b add AllTestsTest for skeleton app 2014-01-14 17:51:50 -05:00
Matthew Ouyang
84eb46dbdc allow additional status codes through constructor
through $options['statusCodes']
2014-01-14 11:18:57 -05:00
Mark Story
05b2196cd5 Merge pull request #2638 from dereuromark/2.5-assert
2.5 assert
2014-01-09 17:21:21 -08:00
euromark
690f54ad9d more corrections in order 2014-01-10 00:33:27 +01:00
euromark
3ff23c732f unify and correct assert order 2014-01-10 00:18:08 +01:00
José Lorenzo Rodríguez
606362d519 Merge pull request #2636 from dereuromark/2.5-title-for-layout
Follow the deprecation note in the doc block of View class
2014-01-09 15:13:07 -08:00
euromark
97e43e5806 unify to expected 2014-01-09 16:52:21 +01:00
euromark
738b34c2d0 Correct assert param order 2014-01-09 16:50:27 +01:00
euromark
29e15386b2 Follow the deprecation note of 2.1 migration guide and switch to fetch(title)
correct assert order for test
2014-01-09 16:45:49 +01:00
Mark
db1e7c13fb Merge pull request #2635 from bcrowe/hotfix-timeDocBlock
Simple docblock updates to CakeTime
2014-01-08 18:40:57 -08:00
Bryan Crowe
cd27012405 Simple docblock updates to CakeTime 2014-01-08 21:38:45 -05:00
Mark Story
9bf7513ba9 Merge pull request #2628 from pummra/patch-1
Add message to let user know that no controllers were generated.
2014-01-08 06:43:12 -08:00