Commit graph

9995 commits

Author SHA1 Message Date
Juan Basso
5ab5197090 Less one var. 2011-02-25 12:54:48 -03:00
Juan Basso
6e14fa8949 Moving attributes from Datasource to DboDataSource. 2011-02-25 12:54:46 -03:00
Juan Basso
f15544018f Minor optimizations in find. 2011-02-25 12:54:44 -03:00
Juan Basso
5bfa0867ef Removed the support to notation of 1.2. 2011-02-25 12:54:43 -03:00
Juan Basso
31679c3efa Changed the scope of methods in Model. 2011-02-25 12:54:41 -03:00
mark_story
e05c6cd83f Fixing issue where actions starting with a prefix but not followed by an _ would get mangled when going through router::url().
Fixes #1556
2011-02-24 16:43:13 -05:00
José Lorenzo Rodríguez
19bcec599b Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
Conflicts:
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
2011-02-24 01:38:11 -04:30
José Lorenzo Rodríguez
69b70249da Fixing more issues with database prefixes 2011-02-24 01:31:03 -04:30
José Lorenzo Rodríguez
ea7f0bf900 Fixing some tests to make them run with table prefixes 2011-02-23 23:44:48 -04:30
mark_story
139d6b3133 Changing the checks surrounding dataExpression to use empty() instead of isset() so unexpected things don't happen if you ever use dataExpression = false. Fixes #1521 2011-02-23 21:15:39 -05:00
mark_story
9367a10522 Merge branch '1.3' of github.com:cakephp/cakephp into 1.3 2011-02-23 21:07:10 -05:00
mark_story
98df3e331f Fixing DboMysql not quoting database names in listSources.
Updated tests.
Fixes #1552
2011-02-23 11:36:41 -05:00
mark_story
30c7b954ec Fixing greedy regexp in project task. 2011-02-23 11:26:43 -05:00
José Lorenzo Rodríguez
00f3aaf615 Fixing some issues in ACL related classes when using database prefixes 2011-02-23 01:22:23 -04:30
José Lorenzo Rodríguez
8f62d01701 Fixing lazy loading of database conenction when using prefixes and performing delete operations 2011-02-23 00:51:48 -04:30
José Lorenzo Rodríguez
fc060b5e9c Starting to lazy load database conenctions again, model read tests fixed 2011-02-23 00:43:56 -04:30
José Lorenzo Rodríguez
a79877d11a Revert "Making Model::setSource() eager again to fix issues where joined models"
This reverts commit d20f68c44e.
2011-02-22 23:49:02 -04:30
José Lorenzo Rodríguez
b62c8d8ee2 Fixing bug in RequestHandler that was preventing the helper related to content type to be loaded correctly 2011-02-22 23:42:14 -04:30
José Lorenzo Rodríguez
2371ed9f15 Reverting change made in model constructor to lazily initialize the modelClass variable, making remaining controller tests pass 2011-02-22 23:36:53 -04:30
José Lorenzo Rodríguez
ff1942d271 Automatically adding the declaration of the PluginAppModel class in ClassRegistry::init(), making more controller tests pass 2011-02-22 23:03:04 -04:30
José Lorenzo Rodríguez
ffacbd7d27 Fixing pages controller test 2011-02-22 22:49:33 -04:30
José Lorenzo Rodríguez
4e1fcbed61 Fixing ScaffoldView test 2011-02-22 22:47:07 -04:30
José Lorenzo Rodríguez
90cdf5102e Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-02-22 22:34:58 -04:30
Juan Basso
52163b4b05 Allowing strings in cc and bcc. Fixes #1553. 2011-02-22 21:23:15 -03:00
mark_story
d4cdc118d2 Fixing notice error that happens when you run tests for plugins. 2011-02-22 08:41:36 -05:00
José Lorenzo Rodríguez
deae38546b Fixing App::objects() and App::setObjects() so all dispatcher tests pass 2011-02-22 00:44:33 -04:30
José Lorenzo Rodríguez
688e914381 Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-02-22 00:13:57 -04:30
José Lorenzo Rodríguez
a9d2078d25 Revert "Refactoring Dispatcher::_isPrivate to directly check for controller methods, doing in in the controller could be unnecessary"
This reverts commit c431ddd22c.

Conflicts:

	lib/Cake/Routing/Dispatcher.php
2011-02-22 00:13:35 -04:30
José Lorenzo Rodríguez
b1e007f231 Correctly importing classes in BasicAuthentication test 2011-02-22 00:06:11 -04:30
José Lorenzo Rodríguez
3e7b85dc34 Correctly importing classes in DigetAuthentication test 2011-02-22 00:04:21 -04:30
José Lorenzo Rodríguez
dbff3b8c58 Correctly importing HttpResponse in test 2011-02-22 00:02:35 -04:30
José Lorenzo Rodríguez
0cb08a09dc Fixing class loading for authentication clasess in HttpSocket, also allowing the use of plugin authentication classes 2011-02-21 23:58:46 -04:30
José Lorenzo Rodríguez
b314149efd Checkin that PluginAppModel is not in the list of modles to be used for CakeSchema 2011-02-21 23:28:00 -04:30
mark_story
6426b7ec04 Fixing issues with / routes, as PATH_INFO doesn't exist.
Changing foreach loop for if elseif blocks, and removing use of env().  The values we want will never be anywhere else by _SERVER, so don't incur extra overhead looking places it won't be.
Added tests.
2011-02-21 22:30:01 -05:00
José Lorenzo Rodríguez
c105899cbc Removing use of old constant 2011-02-21 22:48:22 -04:30
José Lorenzo Rodríguez
6e60216c13 Fixing error in testLoader class checking 2011-02-21 22:43:49 -04:30
José Lorenzo Rodríguez
4cebe55a9b Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	app/webroot/index.php
	lib/Cake/Controller/Component/AuthComponent.php
	lib/Cake/Network/CakeRequest.php
	lib/Cake/tests/cases/libs/controller/components/auth.test.php
2011-02-21 22:28:30 -04:30
Juan Basso
21a9904a71 Adding a protection to cake console be executed in driver root (windows). Fixes #1408. 2011-02-21 17:55:15 -03:00
Juan Basso
c5f291958b Adding extra protection to cake console be executed in driver root (windows). 2011-02-21 17:36:32 -03:00
ADmad
1f2afd8d3f Removing deprecated function TimeHelper::relativeTime() which was simply an alias for TimeHelper::timeAgoInWords() 2011-02-22 01:27:46 +05:30
ADmad
709ed7675b Fixing typo in PHPUnit include file path 2011-02-22 01:21:26 +05:30
mark_story
0b75906649 Adding docs about the ability to set settings in the helper as well. 2011-02-21 14:08:29 -05:00
mark_story
c64dd9d352 Adding the ability to pass additional information into the rendering of flash messages. Allows you to keep keep code DRY by moving repeated settings into the view.
Added tests.
Fixes #792
2011-02-21 14:08:29 -05:00
Juan Basso
e1b3703c20 Adding a protection to cake console be executed in driver root (windows). Fixes #1408. 2011-02-21 15:46:55 -03:00
mark_story
6338299e77 Merge branch 'clean-get' into 2.0 2011-02-21 12:47:41 -05:00
mark_story
1f9bbbce53 Pulling windows specific tests into a separate test method. 2011-02-21 10:48:34 -05:00
Victor Widell
d0b7d3355d $this->data[$habtmKey] could be a string, meaning $this->data[$habtmKey][$habtmKey] would be the first character of that string. Probably not what you want.
Fixes #1549

Signed-off-by: mark_story <mark@mark-story.com>
2011-02-21 10:39:55 -05:00
mark_story
440a89051d Fixing test that didn't fail as expected. 2011-02-20 22:33:10 -05:00
mark_story
d1821b3f9d Removing $request->query[url]. This simulated value is also available at $request->url, and having it in the query array confuses things, as GET[url] no longer exists.
Fixing failing tests elsewhere in the framework.
2011-02-20 21:52:20 -05:00
mark_story
2190596764 Fixing htaccess file to not use GET params anymore. 2011-02-20 13:57:38 -05:00