mark_story
7259a1b920
Merge branch '1.2' into 1.2-merger
...
Conflicts:
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/helpers/text.php
cake/libs/view/theme.php
2009-12-06 21:43:53 -05:00
ADmad
ad20e43730
Removing unneeded code for minor optimization
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-26 09:54:25 -05:00
predominant
62810fb4f4
Updating more Copyright dates.
2009-11-06 18:04:38 +11:00
predominant
1185681549
Removing newline caused by Subversion line removal.
2009-11-06 18:01:22 +11:00
predominant
384bb7a0e0
Update license lines throughout.
2009-11-06 17:51:51 +11:00
predominant
d7b604c8ed
Fixing links throughout
2009-11-06 17:46:59 +11:00
predominant
8ff6505fe8
Removing excess whitespace
2009-11-06 17:08:23 +11:00
predominant
6782cb019c
Update CakePHP Project link.
2009-11-06 17:00:11 +11:00
predominant
5dfe1777af
Removing Subversion file headers.
2009-11-06 16:51:09 +11:00
predominant
ceee56013c
Remove Subversion $Date$ lines.
2009-11-06 16:17:01 +11:00
predominant
04f1b6cdfe
Remove Subversion $LastChangedBy$ lines.
2009-11-06 16:11:16 +11:00
predominant
42f3f16d60
Remove subversion $Revision$ lines.
2009-11-06 16:08:02 +11:00
predominant
8f75ff58c7
Removing @filesource
2009-11-06 15:24:02 +11:00
mark_story
a3bb77c4f3
Merge branch '1.2' into 1.3-merger
...
Conflicts:
cake/console/libs/acl.php
cake/console/libs/tasks/controller.php
cake/console/libs/tasks/db_config.php
cake/console/libs/tasks/model.php
cake/console/libs/templates/skel/views/layouts/xml/default.ctp
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/validation.php
cake/libs/view/helpers/form.php
cake/tests/cases/basics.test.php
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/libs/cake_test_case.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
cake/tests/cases/libs/view/helpers/javascript.test.php
cake/tests/cases/libs/view/helpers/session.test.php
cake/tests/groups/controller.group.php
cake/tests/groups/lib.group.php
cake/tests/groups/no_database.group.php
2009-11-01 12:11:49 -05:00
mark_story
0e23fdfbb3
Fixing infinitely nesting stack frames when TreeBehavior::reorder() is called and the models $cacheQueries = true and there are a sizable number of records being manipulated.
...
Test cases added.
Fixes #188
2009-10-21 00:22:36 -04:00
AD7six
b2142df2bc
adding a newline before all comment blocks
2009-07-24 21:18:37 +02:00
mark_story
f0752feeec
Adding patch from 'burzum'. Fixes ambiguous field sql error when joining two trees with a defined scope.
...
Test cases and fixtures added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8178 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-26 17:17:57 +00:00
mark_story
965b8e9641
Updating doc blocks on tree behavior.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8081 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-08 17:12:30 +00:00
AD7six
b9ea171429
fixes #6003 tree behavior fails with uuids
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7997 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-15 00:50:01 +00:00
AD7six
56afb72825
changing $model for $Model to follow conventions ($Model is an object)
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7994 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 23:21:53 +00:00
AD7six
eec4d15898
fixes #5971 - Error generated by behavior if invoking overloaded method from within the behavior
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7993 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 23:19:59 +00:00
AD7six
2f51ccca04
fixes #5772 .
...
Sql errors when using reserved words for a field name with the tree behavior.
Test Case restructured to allow thorough testing of the various permutations inwhich the tree behavior can be used
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7880 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-20 13:57:44 +00:00
AD7six
3f2fa6929b
changing tabs for spaces in comment block indentation
...
Removing address and replacing with cakefoundation url
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
mark_story
1b456f2cf1
Applying patch from 'davidpersson' fixing code spacing. Closes #5643
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7772 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 00:10:44 +00:00
renan.saddam
e3fb56f6be
Fixing bug when primaryKey is not id. Fixes #5615 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7757 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-17 00:01:36 +00:00
mark_story
62168bfe0f
Updating doc blocks to include access and return PHPDOC tags.
...
Removing use of e() in Debugger.
Fixing code formatting in CookieComponent
Closes #5477
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7662 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-25 16:49:56 +00:00
phpnut
a6f19c8240
Adding fix for Model::afterFind(); not having access to $this->data when using TreeBehavior
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7586 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-09 18:42:18 +00:00
DarkAngelBGE
19d4f3d596
adding a couple 'return home early' refactorings
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7572 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-08 20:33:48 +00:00
AD7six
5e11e1490b
fixes #5339 incorrect bracketting for bindModel statement in tree behavior recover method. removing the actsAs key
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7526 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-27 14:05:58 +00:00
AD7six
460223b61a
fixes #5203 - removeFromTree should return after deleting a node with no children.
...
Also modified removeFromTree to set the parent_id to null if removeFromTree is called on a node with no children and
delete is set to false
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7453 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-11 15:54:54 +00:00
gwoo
4a94397b43
removing deprecated code
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7401 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-01 01:04:03 +00:00
TommyO
b6e9888753
Replaced all instances of ife() in /cake
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7387 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-30 20:34:01 +00:00
the_undefined
95522fa3a9
Applied patch by floob, fixes #4876
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7234 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-22 12:27:54 +00:00
nate
df75a06756
Fixing coding standards violations in core, and adding misc tests
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7222 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-20 20:17:23 +00:00
gwoo
eb67aa879e
fixes #4841 , TreeBehavior ambiguous columns
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7196 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-15 17:51:25 +00:00
AD7six
9d87ce5a06
minor syntax correction, changing a string condition to be an array for consistency
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7195 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-15 13:08:36 +00:00
nate
39feb3f7c1
Refactoring DboSource. Model array conditions must now have comparison operators on the left side, fixes misc bugs, updated core to reflect changes
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7075 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-31 12:36:38 +00:00
nate
42da5aba81
Moving Cake folder to correct location
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7063 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 11:40:08 +00:00
DarkAngelBGE
e6e0d852a2
deleting cake folder from svn
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7061 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 10:59:16 +00:00
AD7six
4bafc397f9
fixes #4761 , tree behavior parameter array merge logic incorrect
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7056 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-28 16:02:31 +00:00
nate
7402680cc1
Misc code formatting and whitespace fixes
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7020 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-23 05:11:41 +00:00
nate
f2ea3c8bb0
Refactoring DboSource to use Model in order to properly quote values by column type, correcting serial integer schema generation in DboPostgres, fixes #4702 , refactoring TreeBehavior to use DboSource::calculate(), fixes #4725 , updating docblocks, fixing DboSource test to be database-agnostic, misc. whitespace fixes, updating DboSource test to reflect new quoting rules
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7015 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-22 19:05:37 +00:00
AD7six
84eb4ae36d
updated tree behavior addressing most of the issues related to its use with postgreSQL and sqlite
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6995 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-21 20:03:12 +00:00
DarkAngelBGE
a625537c4e
optimization, refs #3877 , fixes #3415
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6969 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-19 20:31:42 +00:00
the_undefined
e5d7f5279e
Merged relevant test cases from 'alkemann' into tree test and made them pass, fixes #4493
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6939 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-19 03:03:44 +00:00
nate
c286a7293f
Adding test cases for TreeBehavior scoping
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6591 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-19 00:54:32 +00:00
nate
360b91eea7
Fixing HABTM associations on non-standard keys, fixes #4219 , refactoring DboSource::calculate()
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6565 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-13 03:11:29 +00:00
phpnut
acc79fe0f3
"Closes #2508 , Allow requestAction to use array urls
...
Fixes #4325 , error pages no longer displayed since changeset
Closes #4329 , remove am() usage in core"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6563 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-12 21:19:31 +00:00
nate
c1c35b2e13
Refactoring DboSource - removes all SQL from Model, refactoring transaction handling
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6557 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-11 02:44:33 +00:00
nate
5ce4469867
Adding fix for parenting issues in Tree behavior, fixes #4043 , fixes #4037
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6500 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-01 20:26:42 +00:00