Commit graph

299 commits

Author SHA1 Message Date
mark_story
4520ff7c82 Making View pass request onto helpers and extract it from a Controller. 2010-05-15 00:52:06 -04:00
predominant
8f880731c6 Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
predominant
1ec220dac2 Removing closing PHP tags. 2010-05-11 08:07:49 +10:00
Mark Story
a17a38ddf4 Fixing fatal errors in View test.
Removing =& and making tests use instanceof instead of is_object()
2010-04-24 00:22:21 -04:00
predominant
c7fcaf995f Convert getMictime() php4 hack to microtime(true) 2010-04-16 02:58:28 +10:00
predominant
c98021dcd8 Converted views, router and security classes to new translation shotcut function use. 2010-04-16 02:20:15 +10:00
predominant
51d71b4541 Adjust view __scripts to be a protected instance variable, and add test methods for View addScript tests. 2010-04-05 21:15:17 +10:00
predominant
50a547167b Changing protected methods to specify protected access. 2010-04-05 13:21:28 +10:00
predominant
1497ec3910 Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00
predominant
850ca02bb6 Changed all public 'var' declarations to be 'public $var' 2010-04-04 17:14:00 +10:00
predominant
29dc12dbc2 Changed all $__ declared variables to private. 2010-04-04 16:33:39 +10:00
Mark Story
46348e9bbd Adding and correcting doc blocks. 2010-03-28 12:53:57 -04:00
Mark Story
4f67f84ff8 Merge branch '1.2' into 1.3-merger
Conflicts:
	app/config/acl.ini.php
	app/config/bootstrap.php
	app/config/core.php
	app/config/database.php.default
	app/config/inflections.php
	app/config/routes.php
	app/config/schema/db_acl.php
	app/config/schema/i18n.php
	app/config/schema/sessions.php
	app/config/sql/db_acl.sql
	app/config/sql/i18n.sql
	app/index.php
	app/webroot/css.php
	app/webroot/css/cake.generic.css
	app/webroot/index.php
	app/webroot/js/vendors.php
	app/webroot/test.php
	cake/LICENSE.txt
	cake/basics.php
	cake/bootstrap.php
	cake/config/config.php
	cake/config/paths.php
	cake/config/unicode/casefolding/0080_00ff.php
	cake/config/unicode/casefolding/0100_017f.php
	cake/config/unicode/casefolding/0180_024F.php
	cake/config/unicode/casefolding/0250_02af.php
	cake/config/unicode/casefolding/0370_03ff.php
	cake/config/unicode/casefolding/0400_04ff.php
	cake/config/unicode/casefolding/0500_052f.php
	cake/config/unicode/casefolding/0530_058f.php
	cake/config/unicode/casefolding/1e00_1eff.php
	cake/config/unicode/casefolding/1f00_1fff.php
	cake/config/unicode/casefolding/2100_214f.php
	cake/config/unicode/casefolding/2150_218f.php
	cake/config/unicode/casefolding/2460_24ff.php
	cake/config/unicode/casefolding/2c00_2c5f.php
	cake/config/unicode/casefolding/2c60_2c7f.php
	cake/config/unicode/casefolding/2c80_2cff.php
	cake/config/unicode/casefolding/ff00_ffef.php
	cake/console/cake
	cake/console/cake.bat
	cake/console/cake.php
	cake/console/error.php
	cake/console/libs/acl.php
	cake/console/libs/api.php
	cake/console/libs/bake.php
	cake/console/libs/console.php
	cake/console/libs/i18n.php
	cake/console/libs/schema.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/db_config.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/model.php
	cake/console/libs/tasks/plugin.php
	cake/console/libs/tasks/project.php
	cake/console/libs/tasks/test.php
	cake/console/libs/tasks/view.php
	cake/console/libs/templates/skel/config/bootstrap.php
	cake/console/libs/templates/skel/config/inflections.php
	cake/console/libs/templates/skel/config/sql/sessions.sql
	cake/console/libs/templates/skel/index.php
	cake/console/libs/templates/skel/views/elements/email/html/default.ctp
	cake/console/libs/templates/skel/views/elements/email/text/default.ctp
	cake/console/libs/templates/skel/views/layouts/ajax.ctp
	cake/console/libs/templates/skel/views/layouts/default.ctp
	cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
	cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
	cake/console/libs/templates/skel/webroot/js/vendors.php
	cake/console/libs/templates/skel/webroot/test.php
	cake/console/libs/templates/views/form.ctp
	cake/console/libs/templates/views/index.ctp
	cake/console/libs/testsuite.php
	cake/console/templates/default/views/view.ctp
	cake/console/templates/skel/app_controller.php
	cake/console/templates/skel/app_helper.php
	cake/console/templates/skel/app_model.php
	cake/console/templates/skel/config/acl.ini.php
	cake/console/templates/skel/config/core.php
	cake/console/templates/skel/config/database.php.default
	cake/console/templates/skel/config/routes.php
	cake/console/templates/skel/config/schema/db_acl.php
	cake/console/templates/skel/config/schema/db_acl.sql
	cake/console/templates/skel/config/schema/i18n.php
	cake/console/templates/skel/config/schema/i18n.sql
	cake/console/templates/skel/config/schema/sessions.php
	cake/console/templates/skel/config/schema/sessions.sql
	cake/console/templates/skel/controllers/pages_controller.php
	cake/console/templates/skel/views/layouts/flash.ctp
	cake/console/templates/skel/webroot/css.php
	cake/console/templates/skel/webroot/css/cake.generic.css
	cake/console/templates/skel/webroot/index.php
	cake/dispatcher.php
	cake/libs/cache.php
	cake/libs/cache/apc.php
	cake/libs/cache/file.php
	cake/libs/cache/memcache.php
	cake/libs/cache/xcache.php
	cake/libs/cake_log.php
	cake/libs/cake_session.php
	cake/libs/cake_socket.php
	cake/libs/class_registry.php
	cake/libs/configure.php
	cake/libs/controller/app_controller.php
	cake/libs/controller/component.php
	cake/libs/controller/components/acl.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/cookie.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/request_handler.php
	cake/libs/controller/components/security.php
	cake/libs/controller/components/session.php
	cake/libs/controller/controller.php
	cake/libs/controller/pages_controller.php
	cake/libs/controller/scaffold.php
	cake/libs/debugger.php
	cake/libs/error.php
	cake/libs/file.php
	cake/libs/flay.php
	cake/libs/folder.php
	cake/libs/http_socket.php
	cake/libs/i18n.php
	cake/libs/inflector.php
	cake/libs/l10n.php
	cake/libs/magic_db.php
	cake/libs/model/app_model.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/behaviors/containable.php
	cake/libs/model/behaviors/translate.php
	cake/libs/model/behaviors/tree.php
	cake/libs/model/cake_schema.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/datasource.php
	cake/libs/model/datasources/dbo/dbo_adodb.php
	cake/libs/model/datasources/dbo/dbo_db2.php
	cake/libs/model/datasources/dbo/dbo_firebird.php
	cake/libs/model/datasources/dbo/dbo_mssql.php
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/model/datasources/dbo/dbo_odbc.php
	cake/libs/model/datasources/dbo/dbo_oracle.php
	cake/libs/model/datasources/dbo/dbo_postgres.php
	cake/libs/model/datasources/dbo/dbo_sqlite.php
	cake/libs/model/datasources/dbo/dbo_sybase.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/model/db_acl.php
	cake/libs/model/model.php
	cake/libs/model/model_behavior.php
	cake/libs/multibyte.php
	cake/libs/object.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/router.php
	cake/libs/sanitize.php
	cake/libs/security.php
	cake/libs/set.php
	cake/libs/string.php
	cake/libs/validation.php
	cake/libs/view/elements/dump.ctp
	cake/libs/view/elements/email/html/default.ctp
	cake/libs/view/elements/email/text/default.ctp
	cake/libs/view/errors/error404.ctp
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/errors/missing_component_class.ctp
	cake/libs/view/errors/missing_component_file.ctp
	cake/libs/view/errors/missing_connection.ctp
	cake/libs/view/errors/missing_controller.ctp
	cake/libs/view/errors/missing_helper_class.ctp
	cake/libs/view/errors/missing_helper_file.ctp
	cake/libs/view/errors/missing_layout.ctp
	cake/libs/view/errors/missing_model.ctp
	cake/libs/view/errors/missing_scaffolddb.ctp
	cake/libs/view/errors/missing_table.ctp
	cake/libs/view/errors/missing_view.ctp
	cake/libs/view/errors/private_action.ctp
	cake/libs/view/errors/scaffold_error.ctp
	cake/libs/view/helper.php
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/app_helper.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/helpers/js.php
	cake/libs/view/helpers/number.php
	cake/libs/view/helpers/paginator.php
	cake/libs/view/helpers/rss.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/text.php
	cake/libs/view/helpers/time.php
	cake/libs/view/helpers/xml.php
	cake/libs/view/layouts/ajax.ctp
	cake/libs/view/layouts/default.ctp
	cake/libs/view/layouts/email/html/default.ctp
	cake/libs/view/layouts/email/text/default.ctp
	cake/libs/view/layouts/flash.ctp
	cake/libs/view/media.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/index.ctp
	cake/libs/view/scaffolds/view.ctp
	cake/libs/view/theme.php
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/basics.test.php
	cake/tests/cases/console/cake.test.php
	cake/tests/cases/console/libs/acl.test.php
	cake/tests/cases/console/libs/api.test.php
	cake/tests/cases/console/libs/schema.test.php
	cake/tests/cases/console/libs/shell.test.php
	cake/tests/cases/console/libs/tasks/extract.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/console/libs/tasks/test.test.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cache.test.php
	cake/tests/cases/libs/cache/apc.test.php
	cake/tests/cases/libs/cache/file.test.php
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/cache/xcache.test.php
	cake/tests/cases/libs/cake_log.test.php
	cake/tests/cases/libs/cake_session.test.php
	cake/tests/cases/libs/cake_socket.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/cake_test_fixture.test.php
	cake/tests/cases/libs/class_registry.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/configure.test.php
	cake/tests/cases/libs/controller/component.test.php
	cake/tests/cases/libs/controller/components/acl.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/cookie.test.php
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/controller/components/session.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/controller/controller_merge_vars.test.php
	cake/tests/cases/libs/controller/pages_controller.test.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/debugger.test.php
	cake/tests/cases/libs/error.test.php
	cake/tests/cases/libs/file.test.php
	cake/tests/cases/libs/flay.test.php
	cake/tests/cases/libs/folder.test.php
	cake/tests/cases/libs/http_socket.test.php
	cake/tests/cases/libs/i18n.test.php
	cake/tests/cases/libs/inflector.test.php
	cake/tests/cases/libs/l10n.test.php
	cake/tests/cases/libs/magic_db.test.php
	cake/tests/cases/libs/model/behaviors/acl.test.php
	cake/tests/cases/libs/model/behaviors/containable.test.php
	cake/tests/cases/libs/model/behaviors/translate.test.php
	cake/tests/cases/libs/model/behaviors/tree.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
	cake/tests/cases/libs/model/connection_manager.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.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/model/datasources/dbo/dbo_oracle.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/cases/libs/model/db_acl.test.php
	cake/tests/cases/libs/model/model.test.php
	cake/tests/cases/libs/model/model_behavior.test.php
	cake/tests/cases/libs/model/model_delete.test.php
	cake/tests/cases/libs/model/model_integration.test.php
	cake/tests/cases/libs/model/model_read.test.php
	cake/tests/cases/libs/model/model_validation.test.php
	cake/tests/cases/libs/model/model_write.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/multibyte.test.php
	cake/tests/cases/libs/object.test.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/sanitize.test.php
	cake/tests/cases/libs/security.test.php
	cake/tests/cases/libs/set.test.php
	cake/tests/cases/libs/string.test.php
	cake/tests/cases/libs/test_manager.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/helper.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
	cake/tests/cases/libs/view/helpers/form.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/cases/libs/view/helpers/number.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
	cake/tests/cases/libs/view/helpers/rss.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/cases/libs/view/helpers/text.test.php
	cake/tests/cases/libs/view/helpers/time.test.php
	cake/tests/cases/libs/view/helpers/xml.test.php
	cake/tests/cases/libs/view/theme.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/cases/libs/xml.test.php
	cake/tests/fixtures/account_fixture.php
	cake/tests/fixtures/aco_action_fixture.php
	cake/tests/fixtures/aco_fixture.php
	cake/tests/fixtures/aco_two_fixture.php
	cake/tests/fixtures/advertisement_fixture.php
	cake/tests/fixtures/another_article_fixture.php
	cake/tests/fixtures/apple_fixture.php
	cake/tests/fixtures/aro_fixture.php
	cake/tests/fixtures/aro_two_fixture.php
	cake/tests/fixtures/aros_aco_fixture.php
	cake/tests/fixtures/aros_aco_two_fixture.php
	cake/tests/fixtures/article_featured_fixture.php
	cake/tests/fixtures/article_featureds_tags_fixture.php
	cake/tests/fixtures/article_fixture.php
	cake/tests/fixtures/articles_tag_fixture.php
	cake/tests/fixtures/attachment_fixture.php
	cake/tests/fixtures/auth_user_custom_field_fixture.php
	cake/tests/fixtures/auth_user_fixture.php
	cake/tests/fixtures/author_fixture.php
	cake/tests/fixtures/basket_fixture.php
	cake/tests/fixtures/bid_fixture.php
	cake/tests/fixtures/binary_test_fixture.php
	cake/tests/fixtures/book_fixture.php
	cake/tests/fixtures/cache_test_model_fixture.php
	cake/tests/fixtures/callback_fixture.php
	cake/tests/fixtures/category_fixture.php
	cake/tests/fixtures/category_thread_fixture.php
	cake/tests/fixtures/cd_fixture.php
	cake/tests/fixtures/comment_fixture.php
	cake/tests/fixtures/content_account_fixture.php
	cake/tests/fixtures/content_fixture.php
	cake/tests/fixtures/counter_cache_post_fixture.php
	cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
	cake/tests/fixtures/counter_cache_user_fixture.php
	cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
	cake/tests/fixtures/data_test_fixture.php
	cake/tests/fixtures/datatype_fixture.php
	cake/tests/fixtures/dependency_fixture.php
	cake/tests/fixtures/device_fixture.php
	cake/tests/fixtures/device_type_category_fixture.php
	cake/tests/fixtures/device_type_fixture.php
	cake/tests/fixtures/document_directory_fixture.php
	cake/tests/fixtures/document_fixture.php
	cake/tests/fixtures/exterior_type_category_fixture.php
	cake/tests/fixtures/feature_set_fixture.php
	cake/tests/fixtures/featured_fixture.php
	cake/tests/fixtures/film_file_fixture.php
	cake/tests/fixtures/flag_tree_fixture.php
	cake/tests/fixtures/fruit_fixture.php
	cake/tests/fixtures/fruits_uuid_tag_fixture.php
	cake/tests/fixtures/home_fixture.php
	cake/tests/fixtures/image_fixture.php
	cake/tests/fixtures/item_fixture.php
	cake/tests/fixtures/items_portfolio_fixture.php
	cake/tests/fixtures/join_a_b_fixture.php
	cake/tests/fixtures/join_a_c_fixture.php
	cake/tests/fixtures/join_a_fixture.php
	cake/tests/fixtures/join_b_fixture.php
	cake/tests/fixtures/join_c_fixture.php
	cake/tests/fixtures/join_thing_fixture.php
	cake/tests/fixtures/message_fixture.php
	cake/tests/fixtures/my_categories_my_products_fixture.php
	cake/tests/fixtures/my_categories_my_users_fixture.php
	cake/tests/fixtures/my_category_fixture.php
	cake/tests/fixtures/my_product_fixture.php
	cake/tests/fixtures/my_user_fixture.php
	cake/tests/fixtures/node_fixture.php
	cake/tests/fixtures/number_tree_fixture.php
	cake/tests/fixtures/number_tree_two_fixture.php
	cake/tests/fixtures/numeric_article_fixture.php
	cake/tests/fixtures/overall_favorite_fixture.php
	cake/tests/fixtures/person_fixture.php
	cake/tests/fixtures/portfolio_fixture.php
	cake/tests/fixtures/post_fixture.php
	cake/tests/fixtures/posts_tag_fixture.php
	cake/tests/fixtures/primary_model_fixture.php
	cake/tests/fixtures/product_fixture.php
	cake/tests/fixtures/project_fixture.php
	cake/tests/fixtures/sample_fixture.php
	cake/tests/fixtures/secondary_model_fixture.php
	cake/tests/fixtures/session_fixture.php
	cake/tests/fixtures/something_else_fixture.php
	cake/tests/fixtures/something_fixture.php
	cake/tests/fixtures/stories_tag_fixture.php
	cake/tests/fixtures/story_fixture.php
	cake/tests/fixtures/syfile_fixture.php
	cake/tests/fixtures/tag_fixture.php
	cake/tests/fixtures/test_plugin_article_fixture.php
	cake/tests/fixtures/test_plugin_comment_fixture.php
	cake/tests/fixtures/the_paper_monkies_fixture.php
	cake/tests/fixtures/thread_fixture.php
	cake/tests/fixtures/translate_article_fixture.php
	cake/tests/fixtures/translate_fixture.php
	cake/tests/fixtures/translate_table_fixture.php
	cake/tests/fixtures/translated_article_fixture.php
	cake/tests/fixtures/translated_item_fixture.php
	cake/tests/fixtures/unconventional_tree_fixture.php
	cake/tests/fixtures/underscore_field_fixture.php
	cake/tests/fixtures/user_fixture.php
	cake/tests/fixtures/uuid_fixture.php
	cake/tests/fixtures/uuid_tag_fixture.php
	cake/tests/fixtures/uuid_tree_fixture.php
	cake/tests/fixtures/uuiditem_fixture.php
	cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
	cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
	cake/tests/fixtures/uuidportfolio_fixture.php
	cake/tests/groups/acl.group.php
	cake/tests/groups/cache.group.php
	cake/tests/groups/components.group.php
	cake/tests/groups/configure.group.php
	cake/tests/groups/console.group.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/database.group.php
	cake/tests/groups/helpers.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/model.group.php
	cake/tests/groups/no_cross_contamination.group.php
	cake/tests/groups/routing_system.group.php
	cake/tests/groups/socket.group.php
	cake/tests/groups/test_suite.group.php
	cake/tests/groups/view.group.php
	cake/tests/groups/xml.group.php
	cake/tests/lib/cake_reporter.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/cake_test_fixture.php
	cake/tests/lib/cake_test_model.php
	cake/tests/lib/cake_web_test_case.php
	cake/tests/lib/cli_reporter.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/lib/templates/footer.php
	cake/tests/lib/templates/header.php
	cake/tests/lib/templates/menu.php
	cake/tests/lib/templates/simpletest.php
	cake/tests/lib/test_manager.php
	cake/tests/lib/xdebug.php
	cake/tests/test_app/config/acl.ini.php
	cake/tests/test_app/controllers/tests_apps_controller.php
	cake/tests/test_app/controllers/tests_apps_posts_controller.php
	cake/tests/test_app/models/behaviors/persister_one_behavior.php
	cake/tests/test_app/models/behaviors/persister_two_behavior.php
	cake/tests/test_app/models/comment.php
	cake/tests/test_app/models/persister_one.php
	cake/tests/test_app/models/persister_two.php
	cake/tests/test_app/models/post.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
	cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
	cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
	cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
	cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
	cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
	cake/tests/test_app/vendors/Test/MyTest.php
	cake/tests/test_app/vendors/Test/hello.php
	cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
	cake/tests/test_app/vendors/shells/sample.php
	cake/tests/test_app/vendors/somename/some.name.php
	cake/tests/test_app/vendors/welcome.php
	cake/tests/test_app/views/elements/email/html/default.ctp
	cake/tests/test_app/views/elements/email/text/default.ctp
	cake/tests/test_app/views/elements/email/text/wide.ctp
	cake/tests/test_app/views/layouts/ajax.ctp
	cake/tests/test_app/views/layouts/ajax2.ctp
	cake/tests/test_app/views/layouts/cache_layout.ctp
	cake/tests/test_app/views/layouts/default.ctp
	cake/tests/test_app/views/layouts/email/html/default.ctp
	cake/tests/test_app/views/layouts/email/html/thin.ctp
	cake/tests/test_app/views/layouts/email/text/default.ctp
	cake/tests/test_app/views/layouts/flash.ctp
	cake/tests/test_app/views/layouts/multi_cache.ctp
	cake/tests/test_app/views/posts/sequencial_nocache.ctp
	cake/tests/test_app/views/posts/test_nocache_tags.ctp
	index.php
2010-01-26 17:54:34 -05:00
Mark Story
66a8910810 Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
Mark Story
527eec1a54 Fixing doc tags to make merge easier. 2010-01-26 16:51:53 -05:00
Mark Story
c2e7e5642e Updating doc blocks for View and Theme View. 2010-01-25 18:14:16 -05:00
Juan Basso
473e07a674 Putting __() in strings that missing internationalization.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-18 01:06:25 -05:00
Mark Story
a56bc5585c Removing SessionHelper's magical inclusion into the helpers array. Use of SessionHelper must now be explicitly done. Tests updated. 2010-01-13 23:55:09 -05:00
Joël Perras
15b8a3ec71 Updating copyright date on all files. 2010-01-13 23:47:14 -05:00
Mark Story
6efe61d9b2 Removing controller dump and debug = 3 support from View. Controller dumps often cause memory overflow errors, and are generally not useful. 2009-12-19 12:30:31 -05:00
mark_story
bbb61b28f7 Merge branch '1.3-misc' into mergers 2009-12-06 21:11:26 -05:00
mark_story
3b74c93582 Changing how helpers are extracted, fixes issues with view variables not overwriting local helper variables. Fixes #381 2009-12-03 09:55:49 -05:00
phpnut
f83a024a10 Increasing code coverage for View and ThemeView 2009-11-25 23:17:15 -06:00
phpnut
948f6b21e5 Refactored last commit changes are:
To override plugin views with a themed version of the view you would create:
<app_name>/views/themed/<theme_name>/plugins/<plugin_name>/<controller_name>/*.ctp

To override plugin views at the app view level you would create:
<app_name>/views/plugins/<plugin_name>/<controller_name>/*.ctp
2009-11-25 22:58:02 -06:00
phpnut
21eb001a96 Refactoring themes/views to use a centralized location instead of allowing plugins to have themes.
The plugin should include all required views/assets, to override these at the application level using themes you would create:
<app_name>/views/themed/<theme_name>/<plugin_name>/<controller_name>/*.ctp

if you are not using themes you can override them at the app view level:
<app_name>/views/<plugin_name>/<controller_name>/*.ctp
2009-11-25 22:29:54 -06:00
phpnut
c942fa7038 Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-25 08:40:14 -06:00
phpnut
2254bfe5c9 Adding ability for plugins to have there own webroot.
plugins/<PLUGINNAME>/webroot/*

Themes can also be self contained with a webroot directory.
app/views/themed/<THEMENAME>/webroot/*

vendors directory for assets is deprecated and no longer supported
2009-11-25 01:51:25 -06:00
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
Juan Basso
df9e1e0bd1 Replace function join (alias) by implode.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:43:11 -05:00
mark_story
0783176238 Replacing duplicated code with pluginSplit().
Updating test case.
2009-11-15 19:55:20 -05:00
predominant
0977b3fe15 Standardising docblock endings throughout. 2009-11-14 23:19:25 +11: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
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
8f75ff58c7 Removing @filesource 2009-11-06 15:24:02 +11:00
mark_story
9d2628f699 Removing tab 2009-11-02 00:07:16 -05:00
mark_story
6123ed47c4 Removing empty strings that caused undefined string offset errors.
Trimming trailing spaces.
2009-10-22 00:17:48 -04:00
José Lorenzo Rodríguez
ce743c00e8 Expanding Helper an View functionaility to accept deep nested entitities.
This allows the form helper to render inputs with arbitrary number of dot separated parts
2009-10-22 00:17:23 -04:00
mark_story
de8f251758 Replacing $pluginPath loops with App::pluginPath(). Minor optimization for App::pluginPath(). 2009-10-14 09:28:06 -04:00
mark_story
955bd338e7 Unsetting local vars, so that viewVars with the name will be extracted. 2009-10-08 23:55:17 -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
3ef53aa159 Applying optimization from 'wangbo' to View::renderCache(). Fixes #26 2009-09-14 23:56:50 -04:00
mark_story
f1194a4ec9 Commiting fix to pass tests in last commit.
Making View::renderCache tests more specific.
2009-09-14 23:53:04 -04:00
mark_story
2ff5334347 Minor refactor to remove method calls to Inflector::camelize.
Adding tests to ensure references are maintained.
2009-09-03 09:37:25 -04:00
evilbloodydemon
75695341fa Helpers addressed by $this->Helper->func() 2009-09-03 00:58:26 -04:00
mark_story
776992dc6c Further optimizations to path scanning. 2009-08-30 19:13:54 -04:00
mark_story
8be5de947b Minor refactor in how paths are checked, so that fallback extensions are checked only when all paths fail, instead of for each path. Refs #49 2009-08-30 19:07:36 -04:00
mark_story
ef23ecfe07 minor refactor for file_exists checks. 2009-08-30 18:59:07 -04:00
mark_story
31ec714e2e Adding View::_paths() optimization.
Test cases added.
Refs #49
2009-08-23 23:13:56 -04:00
mark_story
325446a8b3 Updating View::_paths to remove an always miss file_exists() check.
Test case added.
Refs #49
2009-08-23 22:43:51 -04:00
mark_story
a0feb84789 Removing support for deprecated .thtml view file extension. 2009-08-22 11:50:02 -04:00
mark_story
7a3a6966c2 Removing deprecated View::renderElement() 2009-08-20 01:20:44 -04:00
mark_story
6b6d7959e1 Updating doc blocks. 2009-08-20 01:20:13 -04:00
mark_story
add1dede86 Removing conditional calling of View::_render() as a static method.
Updating doc blocks.
2009-08-20 01:15:08 -04: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
a9d98e73c3 Merge branch '1.2' into 1.3 2009-07-22 09:27:31 -07:00
gwoo
4cfdd311a9 fixes #6476, crash on missing layout in session flash
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8238 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-21 01:33:12 +00:00
gwoo
bc359259a2 Merge branch '1.2' into 1.3 2009-07-02 09:27:00 -07:00
mark_story
fd818bc493 Applying patch from 'mulleto'. Fixes plugin view file location with CamelCase plugin names. Test cases added.
Fixes #6334

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8202 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-24 22:02:00 +00:00
gwoo
24d78dd671 moving path configuration to App class 2009-06-07 15:24:10 -07:00
nate
23174203e3 Optimizing helper loading loop in View::_render() 2009-02-06 18:13:17 -05:00
mark_story
943bb53dda Correcting callback firing of helpers in view. Tests added fixes #5906
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7948 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-21 22:14:48 +00:00
phpnut
4cdbd4edd9 Removing unreachable code
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7896 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-27 04:52:45 +00:00
mark_story
acb9e72355 Minor refactor to helper callback triggering. Moving repeated loops to _triggerHelpers(). Allows View subclasses to add additional callbacks.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7886 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-24 05:36:06 +00:00
nate
fde0d21053 Cleaning up and finishing code formatting changes in View class.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7854 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-09 03:37:24 +00:00
nate
16eebce7f7 Adding support for DboSource::expression(), plus test in Model case. Fixing code formatting in model test and View class -- wrapping lines at 100 characters.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7853 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-09 03:20:14 +00:00
renan.saddam
6319f8ea69 Removed trailing whitespaces from core.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7847 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 02:54:07 +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
phpnut
8ae5866a1c Additional optimization refactoring
Removed ability to use deprecated / with plugin, helper, etc combinations. The dot notation is only allowed from this point forward.
Corrected tests for the above changes.
Corrected formating in basics.php

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7623 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-18 03:09:19 +00:00
mark_story
2b984bed94 changing array_key_exists to isset. Refs #5161
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7601 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-14 05:00:05 +00:00
DarkAngelBGE
fe82e827f0 Refactoring ScaffoldView::_getViewFileName()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7569 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-08 15:44:32 +00:00
DarkAngelBGE
311072f4ae Refactoring View::_getLayoutFileName()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7568 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-08 15:39:40 +00:00
gwoo
ecac053ea2 minor optimization on loading helpers in view
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7503 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-25 22:56:56 +00:00
mark_story
d9de0c6cd5 Adding documentation to doc-blocks for View
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7425 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-03 05:24:10 +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
mark_story
684fb5fcce Replaced in_array() with array_key_exists(). Closes #4465
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7336 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-12 00:23:08 +00:00
gwoo
abf3d0685a fixes #4986, .ctp extension failover for layouts
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7260 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-25 03:16:53 +00:00
nate
f7a4858503 Correcting coding standards violations
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7220 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-20 11:57:56 +00:00
gwoo
01bf6526c4 fixes #4911, scripts for layout on cache refresh
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7197 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-15 19:48:15 +00:00
mark_story
68af2bb1ed Fixing compatibility with Helper::beforeLayout, Helper::afterLayout and PHP4. Closes #4880
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7163 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-11 00:20:01 +00:00
gwoo
5807def032 updating some view stuff
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7140 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-08 15:44:46 +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
gwoo
f7d07012dd cleaning up some deprecated code. renderElement is deprecated, but a the notice was removed for this release. Notice will be thrown in next release and method will be removed in the following release. Refactor of View Caching, along with addition of enabling beforeFilter and component initialize/startup callbacks. Use {{{
//set for the individual action
var $cacheAction = array('view' => array('duration' => '+1 hour', 'callbacks' => false)); 
//globally disable callbacks for all actions
var $cacheAction = array(callbacks' => false, 'view' => '+1 hour');  
//per method
$this->cacheAction = array('duration' => '+1 hour', 'callbacks' => true);
}}}

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7031 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-23 17:43:13 +00:00
mark_story
6384da5b53 View::beforeLayout and View::afterLayout now implemented closes #4722
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7018 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-23 02:16:36 +00:00
joelmoss
cedb20e612 Replaced all instances of renderElement() with element(). Fixes #4740
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7017 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-22 23:04:36 +00:00
mark_story
2a0f5dd041 Fixed View::element(). If CacheHelper is added to the $helpers array in lowercase, it caused undefined var errors fixes #4705
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6984 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-20 12:22:46 +00:00
mark_story
44470c2e72 Merged View::renderElement() and View::element() closes #4569
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6978 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-20 00:56:17 +00:00
gwoo
84739652c8 adding fix for windows paths in view, thanks renan`saddam for reporting and debugging
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6895 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-15 23:57:24 +00:00
the_undefined
825eb48508 Fixed missing view path for plugins, closes #4244
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6856 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-13 22:18:30 +00:00
nate
925e022e4f Adding check for XDebug in CCM test, fixing database check in MySQL, adding test coverage for View, fixes #4619
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6797 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-11 15:48:45 +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
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
nate
017afa637d Fixing View::render() for custom views on Windows, fixes #4265
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6506 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-03 23:30:52 +00:00
gwoo
d3e2d51cbc updating error handling, error.test, view.test, theme.test, change socket.test to use App::import()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6479 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-02-27 21:22:40 +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