Commit graph

5972 commits

Author SHA1 Message Date
Hikkijp
c622a9dfc2 Fixes bug #3581
Fixes bug #3581 and the issue noticed by markstory
2014-05-27 17:30:38 -03:00
Hikkijp
f7e98e7427 Revert "Fixes bug described in #3581"
This reverts commit e6c6e0bf2c.
2014-05-27 17:25:28 -03:00
Hikkijp
e6c6e0bf2c Fixes bug described in #3581
Routes with '/**' are now correctly handled by the HtmlHelper->link()
2014-05-27 14:03:56 -03:00
Hikkijp
952c7192f4 Revert "Fixes bug described in #3581"
This reverts commit 6c75e3697d.
2014-05-27 14:00:20 -03:00
Hikkijp
6c75e3697d Fixes bug described in #3581
Routes with '/**' are now correctly handled when called by
$this->Html->link() in a view.
2014-05-27 13:50:08 -03:00
mark_story
153141a6c7 Make help clearer around how to use UpgradeShell.
Closes #3504
2014-05-15 11:32:32 -04:00
euromark
143e8e4c56 Make sure invalid arrays return empty array instead of throwing notices. 2014-05-14 23:53:58 +02:00
James Watts
992ab5ea11 Removed the little doc that lied
View::get() never looked up blocks
2014-05-14 20:06:37 +02:00
mark_story
20ef10aca2 Fix inline attachments being broken when only sending an HTML text body.
The rel boundary was closed too early causing inline images to be
incorrectly included in the email message.

Refs #3474
2014-05-14 09:42:25 -04:00
José Lorenzo Rodríguez
5ab02a0ed1 Merge pull request #3493 from Schlaefer/fix-failingModelTaskTest
fixes failing test cases in ModelTaskTest if not run in test-suite
2014-05-14 11:47:28 +02:00
José Lorenzo Rodríguez
73f725e7ff Merge pull request #3489 from rchavik/2.5-composer
Updated the test suite dispatcher to allow use of PHPUnit from Composer
2014-05-14 10:34:21 +02:00
Schlaefer
bf0edd1112 fixes failing test cases in ModelTaskTest if not run in test-suite
Tests 'testSkipTablesAndAll' and 'testExecuteIntoAll' didn't took fixture
table 'core.number_tree' into account.
2014-05-14 10:34:09 +02:00
mark_story
66e733f8b1 Fix test I forgot to fix in b8fa7ce134 2014-05-13 22:12:39 -04:00
David Yell
140e0bbbd3 Updated the test suite dispatcher to allow use of PHPUnit from Composer
Closes #3479
2014-05-14 09:09:53 +07:00
mark_story
b8fa7ce134 Fix issues where emails would have multipart/mixed when they should not.
When sending multi-part emails with no attachments we shouldn't include
the outer multipart/mixed header as it confuses Outlook and causes it to
show the email as having attachments even though there are none.

A bunch of tests need to be adjusted as the empty multipart/mixed
container has been removed.

Fixes #3474
2014-05-13 22:03:06 -04:00
euromark
8af76a3705 Hotfix for older baked templates regarding postLink() 2014-05-13 20:51:39 +02:00
Mark Story
418c0a7b7c Merge pull request #3481 from okinaka/master
Unset $db in DboSource::read().
2014-05-13 14:01:33 -04:00
mark_story
e9ecfe0936 Remove x bit on files.
PHP files should not have executable permission set.
2014-05-13 12:30:14 -04:00
euromark
aefc459907 Fixes baked postLink()s 2014-05-13 17:14:11 +02:00
Kenshin Okinaka
91cb3ddc27 Unset $db in DboSource::read().
After calling $db->queryAssociatin(), it is necessary to unset db. 
This reverts commit 52d425737a.
2014-05-13 21:17:34 +09:00
Schlaefer
e10e8fcb15 fixes failing test case ValidationTest::testDecimalLocaleSet() on OS X
thousand separator isn't set in de_DE but in da_DK
2014-05-13 13:25:53 +02:00
mark_story
780132f892 Update version number to 2.5.0 2014-05-12 22:17:12 -04:00
mark_story
a34d5f733d Fix PaginatorComponent tests.
Because count() queries don't happen in many cases now, the lastQueries
index needs to shift up by one because a query isn't happening anymore.

Refs #3333
2014-05-12 22:10:27 -04:00
mark_story
b2207c1ca8 Reverse conditions to make the cheapest condition first.
We don't need to do a count() if the page is not 1.

Refs #3333
2014-05-12 22:09:27 -04:00
Toby Cox
823f01601d enhancement to paginator
As pointed out, we need to make sure that we are also on the first page
to make this conditional clause valid
2014-05-12 21:49:08 -04:00
Toby Cox
296ea215b1 Enhancement to paginator
No point in finding the count (via model) if the returned result count
is less than our limit. We then know that the count is the count of our
results
2014-05-12 21:49:07 -04:00
mark_story
89cd114e6f Merge branch 'master' into 2.5 2014-05-12 14:30:02 -04:00
mark_story
92e6c138c5 Add missing static on Debugger::output()
This method should have been static the whole time, and the lack of
static was causing tests to fail on PHP 5.6
2014-05-12 14:29:10 -04:00
Dominik
cd445f2526 Add unix socket support to Redis cache engine
Refs #3438
2014-05-11 21:49:32 -04:00
Stephen Cuppett
ed83df5bed Fixes #3469, explicit isset check for counterCache 2014-05-11 19:17:18 -04:00
mark_story
cc49d28ef8 Fix double / in missing component error page.
Fixes #3466
2014-05-10 22:02:22 -04:00
mark_story
cd37810b02 Merge branch 'fix-formhelper'
Fix failing tests on PHP5.2.x
2014-05-09 17:17:23 -04:00
mark_story
51909ae738 Only parse URLs when they contain ://
Parsing incomplete URLs fails in PHP5.2.
2014-05-09 17:01:24 -04:00
euromark
8f0e203fb5 test failed. reverted and corrected doc block instead for BC. 2014-05-08 01:52:48 +02:00
euromark
1caf1cac4b Remove wrong return. 2014-05-08 01:46:08 +02:00
José Lorenzo Rodríguez
751d2d8f2d Merge pull request #3448 from dereuromark/master-controller
Controller::referer() and local URL
2014-05-07 22:42:28 +02:00
mark_story
5469840c80 Fix incorrectly generated URL path.
Refs #3442
2014-05-07 08:52:42 -04:00
mark_story
1103ca7816 Ensure that only the path and query are used to make the hash.
While including the entire protocol, host, port, path and query would be
even better in theory, it gets complicated when proxies and load
balancers are involved.

Fixes #3442
2014-05-06 23:00:11 -04:00
mark_story
559d9d39e7 Make test names match the rest of the tests. 2014-05-06 22:13:44 -04:00
Renan Gonçalves
87683b10f1 Allowing same Authenticate object to be setup with different settings. 2014-05-06 22:10:41 +02:00
Walther Lalk
2dd3cecfaa Fixes issue with Sql Server driver when loading fixtures
Sqlserver::describe is expecting a model object (Unlike other drivers which work with either a object or string). While this does work under normal conditions, it causes a "Trying to get property of non-object" notice when using fixtures. The same problem also causes the testLimitOffsetHack test to fail.

This change does a simple test to ensure that the $model variable is an object before trying to access a property of it. All SqlServer tests are now passing.
2014-05-06 12:43:36 +02:00
ADmad
d466e00644 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
	lib/Cake/Utility/Folder.php
	lib/Cake/VERSION.txt
2014-05-04 14:35:36 +05:30
euromark
57cb7ea260 Correct documentation. 2014-05-02 13:48:39 +02:00
euromark
fecf321cce This is a hotfix for TextHelper which seems to have gone wrong in a merge. tail() is missing completly and the docs for truncate() are the ones for tail(). This fixes it. 2014-05-02 13:33:57 +02:00
Mathew Foscarini
2244e02017 remove constructor return value.
Not sure why this was here, but constructors shouldn't return a value. Nothing in the docs says that a controller's implementation of appError should return a value either. So I figure this was a mistake.
2014-04-30 16:25:01 -04:00
Mathew Foscarini
f7453500b9 fixed case. 2014-04-30 16:19:15 -04:00
Mathew Foscarini
bb726d58ba Grammar fixes
@return will accept the `|` or operator to define multiple return types. Don't use the word `or`.
2014-04-30 16:09:53 -04:00
Mathew Foscarini
ceab9f185f Removed incorrect usage of @deprecated phpDoc
@deprecated is flagging the function element as deprecated in all IDE's that support phpDOC tags. There is no phpDoc tag to deprecate a function parameter.
2014-04-30 09:55:27 -04:00
mark_story
4b5e3c176e Update version number to 2.4.9 2014-04-29 21:52:10 -04:00
mark_story
e1057e3e6b Fix FormHelper::postLink() not working when SecurityComponent is enabled.
The action attribute value was not being included in the generated hash,
so postLink() forms never worked properly.

Fixes #3418
2014-04-29 11:23:52 -04:00