Commit graph

11764 commits

Author SHA1 Message Date
mark_story
049d6e4c76 Fix issue where incorrect elements would be used.
If your view is using an alternate extension and you have elements
that share filenames, the incorrect element would be used.
Fixes #2082
2011-10-11 12:34:57 -04:00
Dave
db51c0539a Fix TextHelper::autoLinkUrls() from linking iframes
iframe and img elements should not be autolinked.
Fixes #GH-208
2011-10-10 22:16:46 -04:00
mark_story
3b1a11e2d2 Add a test for src and href attributes
with TextHelper::autoLinkUrls()
2011-10-10 22:16:10 -04:00
Renan Gonçalves aka renan.saddam
c43ba3f1e7 Merge pull request #238 from majna/2.0-doc-fix
Fixed doc block comments.
2011-10-10 15:34:41 -07:00
Majna
a5220fa7bb Fixed doc block comments. 2011-10-11 00:22:23 +02:00
José Lorenzo Rodríguez
838d4a8b7b Merge pull request #237 from majna/2.0-test-docblocks
Fixing doc blocks in Test suite and some visibility keywords.
2011-10-10 14:32:21 -07:00
Majna
8c3f64be52 Fixing doc blocks in Test suite and some visibility keywords. 2011-10-10 23:18:48 +02:00
mark_story
788d38ccef Merge branch '1.3' into 1.3-merge
Conflicts:
	cake/console/cake.php
	cake/console/libs/shell.php
	cake/tests/cases/console/libs/shell.test.php
2011-10-10 09:37:06 -04:00
mark_story
bc6de18417 Fix issues with using 0 as an option for a shell command.
Fixes #2079
2011-10-10 09:25:46 -04:00
mark_story
455787ade9 Fixing undefined variable reference.
Fixes #2078
2011-10-09 22:34:59 -04:00
mark_story
3f778d8936 Fix inconsistency between app and skel directory.
Fixes #2077
2011-10-08 14:40:11 -04:00
mark_story
e07256b6d4 Update the .htaccess files to increase
compatibility with shared hosting servers.
Fixes #2010
2011-10-07 20:59:20 -04:00
Thomas Ploch
5d3fdfc9d6 Add support for NULL values in Set::format().
Add test case.
Fixes #2076.
2011-10-07 20:27:37 -04:00
Renan Gonçalves aka renan.saddam
a8af97858c Merge pull request #233 from tPl0ch/2.0-model
Removed unnessecary call to array_merge() in Model::_deleteLinks().
2011-10-07 06:08:40 -07:00
Thomas Ploch
d9cd69ac6e Removed unnessecary call to array_merge() in Model::_deleteLinks(). Fixes #2075 . 2011-10-07 15:03:05 +02:00
Jose Lorenzo Rodriguez
c56797a15f Adding destructor in CacheSession handler to avoid a fatal error when closing the session 2011-10-06 23:10:13 -04:30
Jose Lorenzo Rodriguez
a14abd6281 Fixing DatabaseSession handler to correctly close the session before the model object is destroyed by php.
This allows to remove an old hack in ConnectionManager
2011-10-06 23:01:49 -04:30
kaz29
5eb4c5c6da Fixing bug in getEncoding/setEncoding for PostgreSQL.
Fixes #2028

Signed-off-by: mark_story <mark@mark-story.com>
2011-10-06 22:07:08 -04:00
mark_story
924e283012 Making test less specific as this float cast is different
on different installs.
2011-10-06 21:58:11 -04:00
mark_story
d9e51acf0a Fixing failing tests caused by merge with 1.3 2011-10-06 21:23:35 -04:00
mark_story
055224ef68 Merge remote-tracking branch 'origin/1.3' into merger
Conflicts:
	cake/libs/controller/controller.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/lib/cake_test_suite_dispatcher.php
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/Datasource/DataSource.php
	lib/Cake/Model/Datasource/Database/Mysql.php
2011-10-06 21:06:40 -04:00
mark_story
3becdc5959 Removing uses of db->fullTableName() when creating joins.
Refs #2074
2011-10-06 20:34:42 -04:00
ADmad
fa214e8716 Updating old usage Configure::read() to new Configure::read('debug'). Closes #2070 2011-10-06 17:02:15 +05:30
mark_story
2fa2de441f Updating the doc block for Datasource::delete()
Fixes #2054
2011-10-05 22:10:14 -04:00
Jose Lorenzo Rodriguez
17963e980b Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-10-05 21:37:11 -04:30
Jose Lorenzo Rodriguez
ade9e4d154 Fixing another postgres failing test 2011-10-05 21:36:36 -04:30
mark_story
a853c0f93a Fix another typo. 2011-10-05 22:03:18 -04:00
mark_story
c11c5c5719 Fix typo in doc block. 2011-10-05 22:02:15 -04:00
mark_story
c143908a03 Change how floats are formatted in MySQL.
Fixing precision issues where numbers would get truncated.
Also maintaining compatibility with scientific notation.
Fixes #2049
2011-10-05 21:53:52 -04:00
mark_story
ea113922bd Removing extra 0 index in request parameters.
When using requestAction with the return parameter, there
would be an extra 0 index element that would create incorrect
routes in the requestedAction.
Fixes #2067
2011-10-05 20:55:17 -04:00
mark_story
2cc9523509 Adding old webkit gradient prefixes.
Fixes #2066
2011-10-05 17:59:39 -04:00
mark_story
d40bd240ac Add missing echo in MissingHelperClass error page.
Fixes #2065
2011-10-05 17:51:19 -04:00
Jose Lorenzo Rodriguez
fca6fefb4a Weakening the assertion in order to make tests pass, actual difference are in the order of 30 bytes 2011-10-05 13:25:54 -04:30
Jose Lorenzo Rodriguez
0a6fae00fb Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-10-05 12:16:58 -04:30
Jose Lorenzo Rodriguez
16ffee0065 More fixes in checking dates in tests 2011-10-05 12:16:00 -04:30
Mark Story
b91c475bc1 Merge pull request #227 from tPl0ch/2.0-gitignore
Added '/lib/Cake/Console/Templates/skel/tmp' to .gitignore.
2011-10-05 09:03:03 -07:00
Jose Lorenzo Rodriguez
746062d4a4 Fixing a couple of problem when testing dates in ModelWriteTest 2011-10-05 10:16:38 -04:30
Jose Lorenzo Rodriguez
ecb63d93bc Merge branch 'refactoringAppBuild' of https://github.com/basuke/cakephp into basuke-refactoringAppBuild 2011-10-05 10:03:31 -04:30
Thomas Ploch
cd7b7c9ced Added '/lib/Cake/Console/Templates/skel/tmp' to .gitignore file to ignore cache files of CLI. 2011-10-05 15:36:49 +02:00
Yosuke Basuke Suzuki
fbf4449b9e Refactoring: clean up the foreach loop.
- cleaner code.
- reduce call of array_values and array_unique.
- clear intent of code.
2011-10-05 15:13:19 +09:00
Yosuke Basuke Suzuki
810e2a4ffe Bypass unnecessary foreach loop when $paths is empty to improve speed. 2011-10-05 15:08:30 +09:00
mark_story
0e47c98c91 Moving cache disabling earlier so it takes
effect.
Refs #2063
2011-10-04 23:03:44 -04:00
mark_story
a6e4208bdd Fix Controller::paginate and ordering with virtualFields.
Model::isVirtualField() does ensure that model names match the current model.
This creates false positives when doing sorting datasets when an associated
model has a field with the same name as a virtualField.
Fixes #1822. Fixes #1756.
2011-10-04 22:52:28 -04:00
mark_story
e56a2cdb2b Set debug=2 when bake is run.
This should help with model caches being re-used when they shouldn't.
Fixes #2063
2011-10-04 22:25:18 -04:00
mark_story
cb1ce83a54 Removing duplicate inflection.
Fixes #2058
2011-10-04 20:10:25 -04:00
ADmad
dcb704a12b Fixing bug where you couldn't set CakeRequest::$base to empty string using config variable App.base 2011-10-05 00:46:25 +05:30
ceeram
499b5e7268 Merge pull request #223 from Phally/custom-reporter
Custom reporter
2011-10-04 05:39:35 -07:00
Frank de Graaf
69ba1965b8 Changed the order of the include for the custom reporter and added file_exists() to prevent errors. 2011-10-04 09:43:35 +02:00
mark_story
042e817e1b Fix issue where missing command would exit as success. 2011-10-03 23:08:48 -04:00
mark_story
aa7448e3ed Fixing incorrect exit codes on console exceptions.
Uncaught exceptions on the console would result in exit code 0.
This is not helpful in *nix scripting.

- Update the ConsoleErrorHandler to not inherit from the web error handler.
- Make ErrorHandler::_mapErrorCode() public as it isn't overly private.
- Make ConsoleErrorHandler methods instance methods so mocking can be done.
- Add a _stop method to correctly exit.
- Update tests.
2011-10-03 22:48:50 -04:00