Commit graph

1741 commits

Author SHA1 Message Date
phpnut
4cfafba726 Fixing overload() calls in both branches
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3828 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-05 06:56:28 +00:00
phpnut
d77a19e4a4 Adding fix for loadModel() not checking for existence of model before loading
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3827 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-05 06:29:15 +00:00
phpnut
969676bbf9 Fixing path search for the test suite in bake script
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3826 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-04 07:08:17 +00:00
gwoo
1db5de6623 1.2: bake, merging changes from 1.1
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3823 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-03 22:47:43 +00:00
phpnut
b42373467f Adding fix for scaffold when using an alias association, mostly found on self joined models, or models that have multiple associations to the same model
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3820 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-03 21:01:24 +00:00
gwoo
8fef7cf4ba 1.2: fix for groupPath recursive in generateList
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3819 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-03 19:49:32 +00:00
nate
cf6aef3059 Enabling full base URL to be used with array-based URLs in Router::url() (Ticket #1444)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3818 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-03 19:38:54 +00:00
phpnut
0a2db46225 Added a few changes the AclCLI::upgradedb()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3814 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-03 06:24:49 +00:00
phpnut
a8c98f38d9 corrected method name
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3813 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-03 06:09:34 +00:00
phpnut
0c759b9ce7 Adding AclCLI::upgrade() for upgrading previous releases to 1.1.9.x and above
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3812 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-03 06:01:48 +00:00
nate
3b8b34114b Adding path fixes for DataSource loading
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3809 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-03 05:45:11 +00:00
nate
e17610842c Refactoring RequestHandler::setAjax() to use respondAs(), adding fix for respondAs(), and adding RequestHandler::isSSL() (Ticket #1604)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3808 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-03 04:53:27 +00:00
nate
eb01aad01d Fixing associations for ADODB driver (Ticket #1568)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3806 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-03 04:10:40 +00:00
gwoo
9b659da949 1.2: changing some names in Xml class
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3804 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-02 19:20:50 +00:00
nate
b002cd0ec3 Updating method names in XML and XMLNode
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3803 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-02 18:08:21 +00:00
nate
50da950aba Fixing Model::findCount() for ADODB (Ticket #1613)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3802 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-02 14:44:44 +00:00
phpnut
d4e539f1a5 Removing inline comment since \n is not longer converted to < br/>
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3800 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-02 03:51:26 +00:00
nate
91ade8fe45 Enabling overload of AppHelper
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3798 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 20:42:11 +00:00
phpnut
dedb404423 Merging fixes for associations to 1.1.x.x branch
Removed commented code from Model::_ _generateAssociation() in 1.2.x.x

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3796 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 20:31:45 +00:00
phpnut
708dc77ae8 Merging __mergeAssociation() into 1.2 branch
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3793 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 19:27:08 +00:00
phpnut
f187ac9cef Adding fix for IN( sql.
Merging fixes between versions

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3792 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 19:19:11 +00:00
dho
613bb29300 Adding special log output for cli
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3791 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 15:58:52 +00:00
dho
f6be113855 Adding functionality to add and modify database configurations
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3790 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 08:57:51 +00:00
phpnut
9bc506b058 Merging fixes from 1.2.x.x into 1.1.x.x and vice versa.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3788 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 07:15:44 +00:00
phpnut
d6b2545628 Adding fix for #1544.
Adds additional path searches for elements and layouts

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3786 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 06:51:57 +00:00
nate
e72eba2f82 Fixing PostgreSQL boolean conversion (Ticket #1586), and fixing code formatting
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3784 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 06:14:50 +00:00
phpnut
ce9f9bc4da Adding $this->params['requested']; if method is called through requestAction
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3783 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 04:54:25 +00:00
phpnut
29ba60481a Fixing DboSource::execute() so it only logs when fullDebug is set to true
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3782 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 03:52:41 +00:00
phpnut
b4306ac594 Adding fix for #1606
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3781 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 03:24:49 +00:00
gwoo
45fd88df49 bake in 1.1 and 1.2 refactor and bug fixes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3780 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-31 19:57:17 +00:00
phpnut
d7724fbfc4 Adding Controller::_selectedArray() to 1.1.x.x branch
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3779 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-31 19:35:47 +00:00
dho
7a69c02c7c Adding functionality to rename database.php.default to database.php
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3777 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-31 15:59:59 +00:00
dho
fb7e66881c Fixing wrong key names for hasMany associations
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3775 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-31 08:07:16 +00:00
phpnut
19f5a9b677 Adding fix for #1556.
Errors are no longer cached

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3774 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-31 06:52:04 +00:00
phpnut
f22dc77ea1 Added fix for #1442.
SessionHelper was creating a second instance of CakeSession which would call the session_start(). Added a second param that can be set to false so this does not happen anymore

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3771 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-31 06:06:16 +00:00
phpnut
d9113f5165 Adding fix #1532
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3770 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-31 05:23:37 +00:00
phpnut
8963f1d4e1 Added fix for #1535.
Whitespaces are now preserved in error messages

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3769 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-31 05:01:48 +00:00
phpnut
581dec2248 Applied part of patch from #1603
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3768 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-31 03:42:36 +00:00
phpnut
54583f0afe Changing code in View::_loadHelpers() to use Inflector::variable()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3767 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-31 03:20:57 +00:00
phpnut
1634eefce5 Adding Inflector::variable() to create camelBacked version of a string
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3766 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-31 03:14:26 +00:00
dho
846af89259 Refactoring help parameter handling
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3764 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-30 17:58:50 +00:00
nate
40381bf3ff Allowing SessionComponent::write() to accept an associative array of keys/values
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3763 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-30 16:35:57 +00:00
gwoo
b68181311c fixing #1598: bake edit actions
fixing  baked views with admin

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3762 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-28 20:15:41 +00:00
nate
802ec2d913 HTML-escaping select option titles (Ticket #1577)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3761 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-28 16:02:58 +00:00
phpnut
02df38c26f Renaming user_id to foreign_key in all ACL scripts
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3758 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-28 04:40:30 +00:00
phpnut
6af7c6cca9 Added fix for #1317.
Method would return true on the first loop if persistModel was set to true.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3756 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-28 02:54:41 +00:00
nate
add6e512e7 Adding Model::__wakeup() (Ticket #1582)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3754 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-28 00:42:51 +00:00
nate
0bab7de4d6 Updating docblock for Model::create
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3753 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-27 22:35:40 +00:00
nate
d22e84af09 Fixing code formatting
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3752 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-27 21:42:29 +00:00
nate
607dfac428 Enabling auto-load for AppHelper
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3751 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-27 21:41:34 +00:00