Commit graph

3423 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
de52eb88c9 Updating helper class hierarchy, and adding 1.2 fix for Ticket #1569
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3750 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-27 21:40:34 +00:00
nate
45f27cda1c Refactoring Model
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3748 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-27 18:14:35 +00:00
nate
b90109059c Removing references to $this (Ticket #1587)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3743 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-26 16:29:10 +00:00
phpnut
12a6df23ef Adding Controller::_selectedArray().
Changed Bake to use _selectedArray instead of _ _selectedArray()

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3742 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-26 03:08:53 +00:00
nate
79a8944ba4 Refactoring Dbo
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3741 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-25 13:43:35 +00:00
nate
2046eed40d Refactoring DboSource
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3740 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-25 13:27:32 +00:00
gwoo
42676402d3 fix for #1572, $this->id set to lastInsertId after save
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3739 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-25 12:07:16 +00:00
nate
81342be675 Adding additional options for Object::trace()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3732 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-21 01:46:22 +00:00
gwoo
8b680a0107 1.2: router fix for plugins in url()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3731 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-20 21:58:43 +00:00
gwoo
da2cf11ef3 1.2: pass the plugin name to renderElement
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3730 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-20 21:48:35 +00:00
nate
4caa838d09 Adding output fix for dynamically-called methods
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3728 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-20 19:20:50 +00:00
nate
2993a8d412 Adding Router path fixes for error pages (Ticket #1566), fixing code formatting (Dispatcher), and adding API enhancements for model behaviors
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3727 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-20 17:24:37 +00:00
nate
607158de45 Removing deprecated method AjaxHelper::linkToRemote()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3726 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-20 17:22:23 +00:00
nate
3ed7c6e931 Adding 1.2 fix for Ticket #1498
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3725 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-20 02:32:50 +00:00
phpnut
64359fe7ba Removing functions from basics.php that where added as workarounds for PHP < 4.3.
Removing legacy.php and all references to the file

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3717 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-19 00:37:29 +00:00
nate
fd4d9e41e2 Additional commit for [3713]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3716 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-18 23:03:55 +00:00