mark_story
4d37e75f18
Merge branch '1.2' into 1.3-merger
...
Conflicts:
cake/console/libs/tasks/controller.php
cake/console/libs/tasks/extract.php
cake/console/libs/tasks/model.php
cake/libs/configure.php
cake/libs/controller/components/cookie.php
cake/libs/debugger.php
cake/libs/flay.php
cake/libs/http_socket.php
cake/libs/inflector.php
cake/libs/model/cake_schema.php
cake/libs/model/connection_manager.php
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo_source.php
cake/libs/router.php
cake/libs/view/helper.php
cake/libs/view/helpers/form.php
cake/libs/view/helpers/html.php
cake/libs/view/helpers/js.php
2009-11-22 20:38:50 -05:00
mark_story
a96c157d94
Applying optimizations to use of count() from 'jrbasso'
2009-11-21 15:14:21 -05:00
Juan Basso
52fcabc96a
Little optimization in redirect of controller.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:47:42 -05:00
Juan Basso
1cef0ac981
Little optimization in postConditions of controller.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:46:49 -05:00
mark_story
0783176238
Replacing duplicated code with pluginSplit().
...
Updating test case.
2009-11-15 19:55:20 -05:00
mark_story
6b5c247162
Merge commit 'origin/1.2' into mergers
...
Conflicts:
cake/bootstrap.php
cake/console/cake.php
cake/console/libs/tasks/model.php
cake/libs/configure.php
cake/libs/view/helpers/cache.php
cake/libs/view/helpers/paginator.php
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/libs/view/helpers/cache.test.php
2009-11-08 22:21:21 -05:00
mark_story
4bbfcbff7e
Fixing limit:0 and controller::paginate. Removes possibilty to generate sql errors by inputting invalid limit options. Tests updated. Refs #264
2009-11-06 00:44:21 -05: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
0637272bd2
Updating doc block on Controller to include more information about $uses.
2009-10-31 14:25:33 -04:00
mark_story
07002c8b09
Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc
2009-10-03 11:44:26 -04:00
mark_story
070bbb5d0e
Removing magic 'title' key in Controller::set() and View::set()
...
Removing Controller::$pageTitle and View::$pageTitle.
Instead you should set('title_for_layout', $val) from your view or controller.
Test cases updated.
2009-09-28 21:23:40 -04:00
mark_story
29de5e515f
Allowing Controller::flash() layout to be set with a parameter. Fixes #5034
2009-08-27 23:40:36 -04:00
gwoo
6775e0997e
Merge branch '1.2' into 1.3
2009-08-03 13:13:18 -07:00
mark_story
401796e1a9
Adding missing reference operators in Controller::paginate().
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8277 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-03 17:55:16 +00:00
gwoo
062f471b7f
updating App::import usage. ran each test and everything seems ok.
2009-07-25 18:27:02 -07:00
AD7six
b2142df2bc
adding a newline before all comment blocks
2009-07-24 21:18:37 +02:00
gwoo
bc359259a2
Merge branch '1.2' into 1.3
2009-07-02 09:27:00 -07:00
mark_story
16eb51e91c
Adding ControllerMergeVarsTestCase to more extensively test merging of vars in Controller::__mergeVars.
...
Fixing issue where components declared in AppController would get doubled settings if no components were declared in subclasses.
Fixes #6459
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8201 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-24 18:09:14 +00:00
gwoo
15518b8c9a
merging 1.3-misc into master
2009-05-01 14:05:46 -07:00
gwoo
db71202aac
Merge branch '1.2' into 1.3
2009-05-01 08:26:02 -07:00
mark_story
c8cf1a2c5b
Updating __mergeVars to correctly merge parent and child component configurations.
...
Applied patch from 'neilcrookes'.
Test case added. Fixes #6325
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8157 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-28 01:32:20 +00:00
gwoo
ec18aac4ab
Merge branch 1.2 into 1.3
2009-04-15 15:16:01 -07:00
mark_story
9491e4632d
Applying patch from 'SkieDr' to fix custom find type pagination. Removes parameters from exiting paginate(). Test case added.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8137 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-07 14:56:30 +00:00
gwoo
643651fe56
Merge master in 1.3
2009-03-19 14:10:13 -07:00
mark_story
eba2e78d06
Fixing typo in last commit.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8108 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-16 03:06:28 +00:00
mark_story
4dceb5be31
Adding doc blocks for properties that previously had no documentation. Closes #6199
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8107 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-16 03:01:51 +00:00
gwoo
6cb8b3d286
Merge branch 'master' into 1.3.x.x
2009-03-14 13:57:18 -07:00
jperras
ba78e04be9
Fixing doc block for parameter of Controller::flash. Thanks 'ADmad'.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8083 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-09 01:11:38 +00:00
mariano.iglesias
591b9f0582
Fixing wrong usage of array_shift added in r7013
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8072 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-03 23:58:55 +00:00
mark_story
af021cb4b2
Adding Html entity conversion to all urls generated by helpers, fixing potential for merged passedArgs to create xss vectors.
...
Adding integer cast in paginate() to page param.
Tests added/updated.
Fixes #6134
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8061 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-25 19:51:41 +00:00
gwoo
43ad3d76e5
updating code from [8024] [8025]
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8031 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-15 20:13:14 +00:00
mark_story
e045e6826a
Fixing Session from being added to components array twice.
...
Fixing greedy mergeVars with AppController.
Tests Added
Fixes #6091
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8024 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-12 13:36:20 +00:00
gwoo
f0d03a91cf
Merge branch 'master' into 1.3.x.x
2009-02-09 12:01:06 -08:00
mark_story
4b00c29eef
Updating doc blocks to improve readability in API.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8015 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-04 05:00:59 +00:00
nate
c7d133fc0f
Removing variable name inflection from Controller::set()
2009-01-20 14:36:39 -05:00
AD7six
d80e527e5b
fixes #5776
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7882 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-20 16:53:45 +00:00
gwoo
a99ca57762
fixes #5687 , adding Controller::methods to hold available methods for called controller, refactored auth and dispatcher to use this property
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7864 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-11 16:34:05 +00:00
john
863adabe12
Updating Controller docblocks with @link and updating docblock content and grammar.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7808 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 19:30:17 +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
AD7six
ce0a71aef7
fixes #5603 Duplicate first parameter from the paginator with existing url args
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7777 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 22:20:03 +00:00
gwoo
443491e7fa
reverting changes from 7668
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7689 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-02 02:16:09 +00:00
nate
300dbc5e91
Correcting how parameters and default values are merged in Controller::paginate(), fixes #5503
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7688 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-02 00:46:26 +00:00
nate
4b8acf4647
Adding 'type' key to both sets of query calls in Controller::paginate(), fixes #5441
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7680 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-29 21:19:37 +00:00
gwoo
f8f4bcc16c
fixes #5482 , playing with model that uses alias
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7668 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-26 15:27: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
DarkAngelBGE
e245d18ed8
fixes #5469
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7648 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-23 12:04:02 +00:00
mark_story
fafb01b09d
Fixing modelClass when using plugin models.
...
Added TestPluginPost to test_app/test_plugin
Test case added.
Closes #5459
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7641 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-22 04:10:49 +00:00
mark_story
768e25c4fd
Updating Controller::paginate(). Custom paginate() and paginateCount() methods now receive $extra params similar to find('all') and find('count') do. Allows the use of things like 'contain' with custom paginate() methods.
...
Test case added. Closes #5433 refs #5123 .
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7627 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-19 00:46:20 +00:00
nate
66240f0c5d
Refactoring DboPostgres and adding '.' to sequence name detection, fixes #5424 , fixing code formatting
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7620 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-18 00:23:17 +00:00
phpnut
5658e26e07
Changing comparison operators to === (identical) which is faster than == (equal)
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7604 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-14 17:17:49 +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
mark_story
8a76b86c85
Updating doc block for Controller::flash(). Closes #5333
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7511 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-26 18:35:44 +00:00
TommyO
570145d568
Added test to show (deprecated?) support of string status codes in redirect().
...
Fixed fail on string status codes in redirect().
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7410 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-01 11:27:53 +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
gwoo
460b219810
small refactor to Controller::paginate handling of sort direction
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7369 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-27 15:55:19 +00:00
gwoo
e26b7e7a63
refactor dispatcher, fixes #5033
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7365 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-26 20:09:20 +00:00
mark_story
cc098629a6
Added direction check to Controller::paginate(). paginate() now forces 'asc' when wrong. Added tests. Closes #5120
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7357 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-24 02:46:39 +00:00
phpnut
022ffa3f4f
Adding fixes for pagination on associated models.
...
Corrected dot notation use in Controller::paginate();
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7286 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-27 06:25:08 +00:00
gwoo
b8714ede74
fix to paginate sort order for self associated models
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7278 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-27 03:12:45 +00:00
gwoo
1576a83505
fixing issue with sort in pagination and adding tests, removes previously deprecated controller methods and adds trigger_error to recent ones
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7276 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-27 00:43:31 +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
97a57a0f05
fixing bug in error handler when callbacks were moved to construct classes, moved callbacks back to dispatcher for now until we find a better place in the controller, fixed caching for the "home" page by adding check for "/', original test case was incorrect.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7177 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-12 18:36:08 +00:00
phpnut
6807d4c333
Starting initial refactoring of current code base.
...
Made changes to test suite to allow running test without headers already sent errors.
Moved Component::initialize(), Controller::beforeFilter(); and Component::startup(); from Dipatcher::start() to Controller::constructClasses();
Removed Dispatcher::start();
Fixing model instances not being created
Adding additional test to CookieComponent to increase coverage to 95%
Optimizing Set::diff();
Fixing SessionComponent test and RequestHandlerComponent test
Fixing CakeSession tests, removed deprecated code from CakeSession
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7162 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-10 22:38:05 +00:00
the_undefined
2d8e63ae7b
Refactored and updated postConditions to new operator syntax, fixes #4860
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7145 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-09 08:29:56 +00:00
gwoo
b3f605c1d8
fixes #4836 components initialize for error pages, also changing Object::stop() to Object::_stop()
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7116 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-04 19:04:58 +00:00
mark_story
55bcf1e25e
Components can have settings assigned in the components declaration, tests added. Closes #4055
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7112 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-04 02:39:05 +00:00
gwoo
cf896eaa9b
refactoring component handling, closes #4795 , tests added. deprecated Controller::_initComponents();
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7070 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-31 03:54:22 +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
mariano.iglesias
9c722b6999
Improving field detection in Containable. paginate() now avoids sending recursive to find calls when it is not explicitly set. Adding more tests to Containable to show how to paginate, fixes #4746
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7030 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-23 16:12:14 +00:00
mariano.iglesias
62bf371aec
Allowing paginate to override the default find type for fetching records.
...
Set the find type as the first string parameter in your paginate settings:
var $paginate = array('popular', ...);
Check the test case for an example.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7013 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-22 17:07:42 +00:00
mariano.iglesias
8f92952d46
Allowing paginate() to send any extra parameters to the find call, and updating it to use new find notation.
...
Updating test in Containable to reflect how to properly use pagination: just set your 'contain' setting as you do with other pagination parameters, for example:
var $paginate = array('Article' => array('conditions' => ..., 'contain' => array( ... ));
and then do your normal paginate(), without having to set reset to false nor call resetBindings(). Check the test case for an actual example.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7010 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-22 16:25:10 +00:00
DarkAngelBGE
45bccc5215
optimization refs #3415
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6970 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-19 20:36:39 +00:00
the_undefined
8f4eda68fc
Fixed issues with Controller::persistModel and behaviors, closes #4647
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6959 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-19 08:03:00 +00:00
the_undefined
065b8f4281
Made Controller::redirect use Object::stop, fixes #4154
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6947 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-19 05:21:43 +00:00
DarkAngelBGE
d04101a95a
refactoring Controller::referer
...
adding Controller::header() for testability
bring Controller up in code coverage
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6844 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-13 14:22:57 +00:00
phpnut
06d06c85d9
"Fixes #4339 , Providing null for variable with underscores leads to camelcased variable in view"
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6626 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-02 20:14:06 +00:00
phpnut
57918f4199
"Fixing Controller::output; to allow access to the content in Contorller::afterFilter();"
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6554 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-10 13:24:36 +00:00
the_undefined
885b41808f
Fixed return value for Controller::setAction
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6508 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-04 23:44:50 +00:00
nate
f3355bd74b
Removing all references to deprecated 'webservices' and 'bare' routes and route parameters, removing deprecated constants, updating core tests
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6453 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-02-11 06:18:41 +00:00
nate
377643cf2b
Adding deprecation warning to Controller::cleanUpFields()
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6413 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-28 01:14:05 +00:00
nate
d9691a19c8
Refactoring Router::mapResources(), adding tests for REST routing and HTTP method overrides
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6409 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-26 08:50:06 +00:00
phpnut
7098c5558c
"Fixes #3887 , Controller::modelClass incorrect when using AppController::uses"
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6384 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-16 18:09:25 +00:00
phpnut
c47700d8c4
"Removing call to Controller::_initComponents(); and Controller::__mergeVars(); out of Dispatcher"
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6322 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-05 01:31:15 +00:00
phpnut
cb53dc61b0
"Closes #2897 , Built-in file validation.
...
Implemented Validation::extension(); and Vaidation::range();
Updated copyright notices in all files"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6296 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-01 22:18:17 +00:00
phpnut
1aa2324e8e
"Fixes #3786 , Missing keys when Model merges actsAs.
...
Added additional test for Set::merge();
Refactored Controller::_mergeVars."
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6292 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-01 01:07:24 +00:00
phpnut
013133457c
"Fixes #3768 , Controller loads wrong model when plugins controller has the controller name of a main model.
...
moved merging of components, helpers, and uses vars to Controller::_mergeVars(); fixes bug with PluginAppController vars not being merged before components are loaded.
Added call to Controller::_mergeVars(); in Dispatcher::dispatch();"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6291 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-31 23:27:14 +00:00
phpnut
6fe54aa1d0
"Reverting 5254, this change is only for 1.2 branch"
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6255 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-25 09:55:59 +00:00
phpnut
877cf930ad
"Fixes #3748 , Auto loading model classes fail in plugins when using $uses in the AppController"
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6211 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-23 06:45:26 +00:00
gwoo
17610a5287
closes #3302 , Render is to meant to output and allow the program to continue executing. Redirect generally serves to stop the program and start fresh with something new. This changeset makes exit the default behavior on redirect.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6208 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-23 01:17:48 +00:00
gwoo
60f4dd360d
updating View and Controller::flash, fixes #3749 , tests added
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6177 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-20 01:19:19 +00:00
nate
e56b92255f
Adding lower bound for page numbers in Controller::paginate() (Ticket #3683 )
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6133 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-08 08:54:27 +00:00
phpnut
8a2b51c3ec
"Removing all shortcut function usage from the core"
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6128 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-08 06:08:03 +00:00
phpnut
13530f42dc
"Correcting typo"
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6106 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-02 23:03:13 +00:00
phpnut
61eebea0f4
"Refactoring Controller::paginate()"
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6105 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-02 22:58:23 +00:00
nate
00dc6dedb5
Adding fix for Controller::paginate() when default model is loaded from a plugin (Ticket #3660 )
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6098 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-30 22:27:43 +00:00
phpnut
de8e7d8b01
"Closes #1854 , Core.po not loaded when using /app/locale/..../default.po
...
Closes #3539
Fixes #3611 , Cannot redeclare loadmodels
Fixes #3622 , loadControllers() and loadModels() look in wrong folders for AppController resp. AppModel
Added trigger_error to all deprecated functions in basics.php
Refactored I18n class to remove debug_backtrace() usage in basics.php, all translations should be placed in a default.po or .mo file from this point forward.
_ _d() function should be used if domain specific translations are used.
Core translations can be placed in app/locales/{lang}/LC_MESSAGES/core.po or .mo these will now be merged with the specified language strings from default.po will replace the core message strings
All translations are now cached to improve performance.
"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6065 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-23 08:16:23 +00:00
gwoo
c4c6ad1a86
adding check for max pages, fixes #3586
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6041 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-22 02:51:21 +00:00
gwoo
d8e206b9f9
updating controller and auth, fixes #3539
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6036 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-21 17:37:55 +00:00
phpnut
2c28dcf841
"Refactoring Configure::_ _buildPaths();"
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6028 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-20 00:39:37 +00:00
phpnut
e110032089
"Updating Controller::render() to use App::import() for loading the view class
...
Corrected typo in basics.php loadView()"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6027 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-19 16:39:14 +00:00
phpnut
c000940e36
Closes #2119 Only define clone() in PHP4 when it hasn't been already defined.
...
Closes #2213 , Support multiple plugin paths.
Closes #2234 , filepaths to behavior classes should be cached in class.paths.php also
Closes #2345 , ability to group components into subfolders
Closes #2645 , Improvement to basic.php for class loading.
Fixes #3526 , Cache::write, when using just the config name, it fails.
Fixes #3559 , loading plugin model as assoc don't work.
Closes #3567 Controller Folders (Note this does not need routing to work, but controller names can not conflict with others in the same application so naming must still be unique)
Fixes #3579 , email.php component: Parse error with php 4.
Adding new class and file importer.
Updated most of the core to use the importer.
Added ClassRegsitry::init() that will create and instance of an object and store it in the registry.
Deprecated most of the load functions in basics.php
Plugin model loading now forces using the dot notation, to use models within a plugin, all the model associations must be in the PluginName.Model syntax, if this is not used, the plugin will look for the models in the main app/models directory first, if not found then it will search the plugin directories recursively until it finds a model.
var $belongsTo = array('SomeModel'); will look for some_model.php in the app/models
var $belongsTo = array('MyPlugin.SomeModel'); will look for some_model.php in my_plugin/models
var $belongsTo = array('MyPlugin.MyPlugin', 'SomeModel'); will used my_plugin/models/my_plugin.php and app/models/some_model.php
The controllers of the plugin will still look for the default models inside the plugin if var $uses is not set:
var $uses = array('SomeModel'); will look for some_model.php in the app/models
var $uses = array('MyPlugin.SomeModel'); will look for some_model.php in my_plugin/models
var $uses = array('MyPlugin.MyPlugin', 'SomeModel'); will used my_plugin/models/my_plugin.php and app/models/some_model.php
All of the above will work between plugins and main app
These changes also allow placing model and controllers is sub directories
Removed old class.paths.php file generation
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6001 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-16 09:35:19 +00:00
gwoo
e51455cb17
Adding merge support for PluginAppController properties
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5978 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-09 19:56:40 +00:00
gwoo
2edfe3dd53
updating Controller::redirect(), closes #3522 , deprecated Controller::cleanUpFields, see Model::deconstruct()
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5973 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-09 02:34:00 +00:00
mariano.iglesias
490ac83313
Adding more documentation for Controller
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5926 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-30 17:21:23 +00:00
gwoo
fbd3811cd1
removing usage of Model::loadInfo() replaced by Model::schema(), removing new lines at the end of some files, removed deprecated chmodr() function from basics, updated bake and scaffold views
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5912 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-28 04:18:18 +00:00
phpnut
7bc90a2eb1
Fixes #3474 , Plugin Models Not Loading for 1.2.0.5875 pre-beta release.
...
Remove deprecated loadPluginController() from basics.php
Fixed changed loadPluginController to loadController in CacheHelper
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5905 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-27 03:27:09 +00:00
phpnut
f41aa80b78
Removing vars that are no longer used.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5904 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-27 01:32:17 +00:00
phpnut
f25e3b273c
Removing deprecated Controller::generateFieldNames(); and Controller::_selectedArray();
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5903 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-27 01:15:11 +00:00
phpnut
8d6599c34b
Fixing bug for related records not being returned when using $recursive > 1.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5902 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-26 08:40:10 +00:00
mariano.iglesias
896f62544b
Changing @return int to @return integer and @param bool to @param boolean
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5860 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:54:36 +00:00
phpnut
160cd28440
Correcting @return int
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5858 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:11:12 +00:00
phpnut
da97a5c871
Correcting @return bool
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5857 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:09:35 +00:00
mariano.iglesias
897825d596
Adding documentation to classes belonging to Cake console.
...
Standarizing on datatypes used in phpdocblocs and removing unneeded @return types
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5851 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 05:52:20 +00:00
mariano.iglesias
3e4f219df4
Adding documentation for Controller
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5837 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-21 22:49:53 +00:00
phpnut
e78fc1e90c
Fixes #3305 , Console i18n extract using wrong paths.
...
Closes #3396 , i18n fixes
Fixed TranslateBehavior::_getLocale() throwing error if I18n class had not been loaded
Added [P]roject to bake
Updated locale pot file
Removed css and js directories from skel
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5809 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-20 05:55:37 +00:00
gwoo
bf651a279e
updating controller fixes #3191
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5702 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-09-30 19:30:48 +00:00
nate
52f1e2dc5c
Implementing beforeRedirect callback for components, adding JSON and CSV content types to RequestHandler
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5685 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-09-21 17:04:23 +00:00
phpnut
3ce10a4826
Fixes #3191 , problem when input is TIME type
...
Added tests for cleanUpFields()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5671 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-09-19 04:15:24 +00:00
phpnut
7c40e8d6c9
Fixes #3191 , Undefined variable: _hour
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5656 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-09-16 18:54:09 +00:00
phpnut
7fe576f122
Fixes #3195 , Controller::cleanUpFields() doesn't check the schema if the fields allows null
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5624 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-09-10 11:58:19 +00:00
gwoo
5b0a88e724
refactored controller::constructClasses, added tests
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5609 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-30 00:19:07 +00:00
phpnut
37ff270d04
test to close #3151
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5591 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-28 20:35:50 +00:00
gwoo
780fe16c09
refactoring cleanUpFields with tests for #3101
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5568 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-22 01:31:34 +00:00
nate
90567a286a
Moving named argument handling into Router
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5535 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-16 16:31:50 +00:00
gwoo
1e56828522
fix for Controller::referer
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5528 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-15 18:05:28 +00:00
nate
9d799ec7ca
Expanding model support for Controller::paginate()
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5519 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-14 18:46:22 +00:00
gwoo
3769fa796d
updating auth, acl and tests
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5410 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-07-08 21:01:31 +00:00
phpnut
51aa81f336
Adding fix for Ticket #2821 , fixes Controller::postConditions() overrides $data passed in.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5343 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-23 08:24:26 +00:00
phpnut
dac1bd0913
Correcting code structure to standards
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5315 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-20 07:51:52 +00:00
phpnut
23dfd90b29
Correcting code structure to standards
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5313 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-20 06:15:35 +00:00
gwoo
c9a2da3e0c
Refactored Scaffold: deprecated generateFieldNames, aligned scaffold and bake view templates, set var $scaffold = CAKE_ADMIN; will scaffold only the admin actions
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5277 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-14 17:28:35 +00:00
gwoo
851a834995
fixing form helper for tickets #2726 and #2659 , updated tests.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5258 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-08 01:17:40 +00:00
phpnut
41d41cf7e2
Adding fix for undefined variable in Controller::cleanUpFields()
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5250 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-06 17:08:31 +00:00
nate
b2b2da0822
Enabling custom pagination methods in model
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5248 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-05 19:14:28 +00:00
gwoo
68113a4a9a
fixing missing passedArgs member in controller that was not committed in [5228], fixing cleanUpFields to not set a default time or date.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5242 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-04 19:40:01 +00:00
phpnut
800961fc97
Adding changes to Controller::set() to force $camelBacked variables only if second params is null
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5231 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-01 23:04:41 +00:00
phpnut
88dec237a7
Adding change to Controller::set() to force variable to $camelBacked
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5230 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-01 22:41:43 +00:00
phpnut
9be44a5df1
Fixing issue with bad key set in Controller::generateFieldNames() causing HABTM not to save
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5229 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-01 22:12:55 +00:00
gwoo
700368710f
fixing typo in cleanUpfields
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5214 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-28 04:45:14 +00:00
phpnut
cbd5bc9e47
Changing Helper::_ _value(); to Helper::value();
...
Removed HtmlHelper::value();
Changed all references to _ _value() to value();
Started changes needed for loading custom view classes located in a plugin
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5213 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-27 19:54:36 +00:00
phpnut
f916745c87
Implementing lazy loading of plugin models
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5207 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-27 02:32:27 +00:00
gwoo
97879bc516
fixing typo
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5206 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-27 00:42:02 +00:00
gwoo
80845b11c5
adding check to previous cleanUpFields fix
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5205 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-27 00:40:40 +00:00
gwoo
741e77c4b0
updating cleanUpFields in 1.2 and 1.2 for #2632
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5204 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-27 00:38:10 +00:00
gwoo
67144a0341
moving beforeRender to before loadView
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5184 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-25 05:41:07 +00:00
nate
eaff06bff6
Adding beforeRender() callback to components
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5159 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-23 18:24:22 +00:00
gwoo
d1d583f0cd
updating scaffolding and css
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5038 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-10 16:19:23 +00:00
dho
7f32528dfa
Applying patch from ticket #2540
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5035 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-08 11:38:41 +00:00