Commit graph

197 commits

Author SHA1 Message Date
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
a77a064164 Updating doc blocks for the helpers. Unifying formatting and adding missing @access tags and fixing various formatting differences. 2010-01-25 17:59:05 -05:00
Juan Basso
e328043586 Minor optimization in helper. No need cast, always is array. 2010-01-20 01:41:43 -04:30
Joël Perras
15b8a3ec71 Updating copyright date on all files. 2010-01-13 23:47:14 -05:00
phpnut
903a1fd95a Adding new Configure::$App['www_root']
Helper::webroot(); will now check for theme assets in APP/webroot/theme/<theme_name>/
Adding ico key to Media::$mimeType;
Fixed bug in previous commits that would not use views/themed/<theme_name>/layouts/ from a plugin
Adding test cases for Helper::webroot();
Adding more tests for ThemeView.
2009-11-26 14:52:38 -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
predominant
0049c9ad81 Renaming Helper::__name to Helper::_name for proper access level for extension overloading and callback. 2009-11-15 21:18:46 +11:00
predominant
0977b3fe15 Standardising docblock endings throughout. 2009-11-14 23:19:25 +11:00
mark_story
f0628d100b Fixing issues with getting values from habtm data after form posting and validation has failed.
Tests added.
Refs #279
2009-11-09 21:00:19 -05: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
1b9b0aae5e Updating Copyright date to include 2009. 2009-11-06 15:34:28 +11:00
predominant
8f75ff58c7 Removing @filesource 2009-11-06 15:24:02 +11:00
mark_story
380b49a446 Fixing Helper::value() and extraction of habtm data. Refs #256 2009-11-04 14:05:12 -05: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
José Lorenzo Rodríguez
50ec80ff50 Continuing work on Helper::setEntity and associated methods 2009-10-22 00:17:14 -04:00
José Lorenzo Rodríguez
2941e89da3 Making Helper::viewEntity accept any number of levels 2009-10-22 00:16:37 -04:00
mark_story
fc4df2bb64 Updating documentation. 2009-10-16 22:53:38 -04:00
mark_story
ee514f3fc6 Adding Helper::assetTimestamp()
Refactor's repeated code from Html and Javascript Helpers.
Test cases added.
2009-09-23 23:45:11 -04:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
renan.saddam
bd7bd5d891 Fixing issue when generating textarea with null value.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8146 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-16 18:12:01 +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
mark_story
2da0c208d5 Fixing Helper::value() when only a fieldname is used. Refactoring Helper::value() to reduce method calls. Added tests to Helper. Fixes #6033
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8012 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-26 19:45:55 +00:00
mark_story
b94a85e938 Altering Helper::url() to enforce escaped query strings for generated urls.
Tests added to Html::link().  Fixes #5982

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7991 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 22:41:47 +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
nate
80c1950530 Refactoring FormHelper security token generation, fixing code formatting
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7639 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-21 04:06:37 +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
phpnut
cb487bd6e6 More optimization refactoring.
Fix cache but causing  object_map to be created and deleted on each request.
Replacing function and method calls with better performing code.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7596 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-12 05:11:34 +00:00
phpnut
80fa429785 Adding fix for undefined notice in vendors.php
Removed check for required file in Cache::!__loadEngine();
Fixed cache being wrote on each request from Configure::listObjects(); when data was an empty array
Removed extra call to App::getInstance(); in App::import();
Moved setting of App::!__loaded; inside of if statement.
Removed cake core install directory paths from the cached dir_map.
Changed uses('file'); to require statement in file.php
Changed uses('set'); to require statement in inflector.php
Removed check for existing inflections.php since this file has been included in 1.2 since Dev releases.
Added additional test for Helper::clean();
Fixed bug in Helper::!__clean();
Fixed random output of 1 when using MediaView;
Added csv mime type to MediaView



git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7516 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-27 03:42:17 +00:00
mark_story
21acac5c59 Removing Helper::assign()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7477 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-19 01:25:33 +00:00
nate
974e62baf1 Adding file to previous commit
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7404 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-01 04:53:45 +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
7ad1790ea2 removing and moving deprecated code
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7285 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-27 06:19:04 +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
mariano.iglesias
768e0c748b Keeping index when setting validation errors for saveAll, fixes #4769 and closes #4462
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7079 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-31 22:01:47 +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
mark_story
6ed1fc8fbe Corrected CONFIGS usage in Helper and Configure as per patch from 'zeuthen'.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7041 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-24 22:46:40 +00:00
gwoo
3263c0bc81 fixes #4571 Helper::clean() returns null if passed empty array or string.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6759 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-05 14:41:15 +00:00
nate
98831d27fe Enabling mutli-record validation errors in FormHelper, fixes #4076
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6540 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-09 18:28:38 +00:00
nate
9a6029f03e Fixing fully-qualified form field references, fixes #4068
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6535 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-09 07:36:34 +00:00
gwoo
fb4244bb89 updating Helper::setEntity() and form.test
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6464 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-02-18 21:58:32 +00:00
nate
7f673226d7 Enabling suffixes for virtual fields, fixes #3724
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6449 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-02-11 02:20:43 +00:00
gwoo
aeaeb97a49 updating helpers for multiple records, fixes #3874
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6356 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-10 18:50:31 +00:00
nate
188ff4737d Removing database-generated primary keys from fixture data, fixed primary key handling in schema generation
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6354 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-10 07:02:33 +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
gwoo
99da081907 updating dispatcher, fixes #3773, fixes #3783, fixes #3779, updating default layouts, adding Debugger::dump($var); and some other changes for exporting string vars
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6272 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-29 19:05:22 +00:00
nate
10a2a446d3 Fixing FormHelper::select() with multiple checkbox option when all options are de-selected (Ticket #3716)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6191 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-22 04:20:35 +00:00
nate
2bec88b134 Adding fix for array to string conversion error in Helper::__formatAttribute() (Ticket #3674)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6162 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-15 23:00:42 +00:00
nate
003aaec870 Adding PaginatorHelper::url() (Ticket #2493), refactoring Paginator, eliminating extra space in <a /> tags
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6151 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-14 15:07:25 +00:00
gwoo
16ee2d2661 fixing fieldSuffix in Helper::setEntity(), closes #3724 added tests.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6143 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-12 04:08:19 +00:00
phpnut
d4129b7c5e "Adding additional removal of harmful content when using Helper::clean();"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6137 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-09 06:43:44 +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
gwoo
f3d0b54cb3 fix for Helper::setEntity(), tests added
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6125 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-07 10:55:42 +00:00
phpnut
872dfbfcef "Correcting Helper::setEntity() check if $parts[0] matches current model
Added tests for fix.
Adding escaping of \\ in FileEngine::write();"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6119 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-06 07:43:19 +00:00
gwoo
adcba2cc2d updating Helper::value, adding some tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6118 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-06 01:16:14 +00:00
gwoo
a215688e87 adding support for multiple records in Helper::value()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6024 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-19 09:05:20 +00:00
nate
b3e4b64aa6 Adding Helper/FormHelper fixes for field names which are like model names (Ticket #3588)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6011 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-17 04:27:24 +00:00
phpnut
eb6c94a01e Closes #2781, $form->input on date fields renders maxYear and minYear in $options as HTML attributes.
Closes #3181, Year list ordering in FormHelper order is now formated descending.
Fixes #3524, FormHelper->month, day, year, hour, and minute should use $selected if it is supplied.
Fixes #3558, post validation don't pass if form use only hidden fields.
Fixes #3568, Saving datetime fields is broken in scaffolding.
Fixes #3574, Typo in Session class.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5987 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-12 11:31:43 +00:00
gwoo
6c0e70faa5 updating scope in Helper::setEntity()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5981 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-12 00:57:38 +00:00
gwoo
d303a64f65 refactoring Helper::setEntity, adding test cases
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5970 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-09 00:17:44 +00:00
gwoo
42767170d1 fixing habtm
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5967 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-08 01:44:47 +00:00
nate
858447a184 Fixing date/time inputs and removing dependency on Controller::cleanUpFields()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5965 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-08 00:05:12 +00:00
nate
6040dd2779 Updating helpers with new form field naming scheme
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5945 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-04 18:07:59 +00:00
nate
7e9b05e429 Adding hidden form inputs for REST routing
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5913 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-28 05:28:45 +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
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
nate
5a2a7c8f46 Fixing undefined offset issue with multi-select elements
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5750 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-11 19:55:24 +00:00
nate
736ab28b0b Refactoring Helper/FormHelper to actually use dynamically generated name attributes; refactoring out extra parameter in FormHelper::radio(), per gwoo
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5744 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-09 20:44:28 +00:00
phpnut
85492fba92 Adding fix for Ticket #2750, fixes rendering of links when requestAction() is used.
Router::url() replaced $_this with $this which is an instance of the class from which the method is called, in the case of this ticket it was an instance of the HtmlHelper

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5319 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-21 06:47:57 +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
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
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
137fea94c6 Cleaning up line endings
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4994 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-03 04:35:25 +00:00
phpnut
4bac0a063b Removing deprecated code and files
/basics.php
 * normalizeList() Deprecated: see Set::normalize
 * countdim() see Set::countDim

libs/controller/components/request_handler.php
 * RequestHandler::disableStartup = false; see RequestHandler::$enabled
 * RequestHandlerComponent::setView() see RequestHandlerComponent::renderAs()
 * RequestHandlerComponent::setAjax() see RequestHandlerComponent::renderAs()

libs/controller/components/session.php
 * SessionComponent::flash() use $session->flash('key'); in your views

libs/controller/controller.php
 * Controller::_setTitle() see Controller::set()

libs/model/datasources/dbo_source.php
 * DboSource::fetchArray() see DboSource::fetchRow()
 * DboSource::one() see DboSource::fetchRow()

libs/model/db_acl.php
 * DB_ACL::getAco()  see AclComponent::$Aco::node()
 * DB_ACL::getAro() see AclComponent::$Aro::node()

libs/neat_array.php
 * Class is not longer available use libs/set.php Set class

libs/sanitize.php
 * Sanitize::sql() see Sanitize::escape()
 * Sanitize::cleanArray() see Sanitize::clean()
 * Sanitize::cleanArrayR() see Sanitize::clean()
 * Sanitize::cleanValue() see Sanitize::clean()

libs/view/helper.php
 * Helper::parseHtmlOptions() see HtmlHelper::_parseAttributes()

libs/view/helpers/form.php
 * define('TAG_DIV', '<div class="%s">%s</div>');
 * define('TAG_P_CLASS', '<p class="%s">%s</p>');
 * define('TAG_LABEL', '<label for="%s">%s</label>');
 * define('TAG_FIELDSET', '<fieldset><legend>%s</legend>%s</label>');
 * FormHelper::labelTag() see FormHelper::label()
 * FormHelper::divTag() see HtmlHelper::div()
 * FormHelper::pTag() see HtmlHelper::para
 * FormHelper::generateInputDiv() see FormHelper::input()
 * FormHelper::generateCheckboxDiv() see FormHelper::input()
 * FormHelper::generateDate() see FormHelper::input()
 * FormHelper::generateTime() see FormHelper::input()
 * FormHelper::generateDateTime() see FormHelper::input()
 * FormHelper::generateAreaDiv() see FormHelper::input()
 * FormHelper::generateSelectDiv() see FormHelper::input()
 * FormHelper::generateSubmitDiv() see FormHelper::input()
 * FormHelper::generateFields() see FormHelper::input()

libs/view/helpers/html.php
 * HtmlHelper::file() see FormHelper::file()
 * HtmlHelper::submit() see FormHelper::submit()
 * HtmlHelper::selectTag() see FormHelper::select()
 * HtmlHelper::formTag() see FormHelper::create()
 * HtmlHelper::linkEmail() see HtmlHelper::link()
 * HtmlHelper::dayOptionTag() see FormHelper::day()
 * HtmlHelper::yearOptionTag() see FormHelper::year()
 * HtmlHelper::monthOptionTag() see FormHelper::month()
 * HtmlHelper::hourOptionTag() see FormHelper::hour()
 * HtmlHelper::minuteOptionTag() see FormHelper::minute()
 * HtmlHelper::meridianOptionTag() see FormHelper::meridian()
 * HtmlHelper::dateTimeOptionTag() see FormHelper::dateTime()

libs/view/helpers/javascript.php
 * JavascriptHelper::linkOut() see JavascriptHelper::link()

libs/view/view.php
 * View::setLayout() use $this->layout in your view

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4981 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-02 08:07:19 +00:00
phpnut
7982208113 Reverting changes in last commit
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4975 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-01 15:17:27 +00:00
nate
154e3ccbb1 Refactoring FormHelper token generation
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4974 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-01 15:03:35 +00:00
phpnut
c91965dc89 Adding fix for #2371, fixes HtmlHelper submit() method doesn't allow HTML entities in caption
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4895 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-28 23:52:19 +00:00
nate
23fc1e8e53 Refactoring FormHelper and fixing 'empty' option for date/time elements in FormHelper::input() (Ticket #2311)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4726 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-01 04:55:56 +00:00
phpnut
8fa50d9100 Adding fix for Ticket #2285
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4671 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-25 01:16:29 +00:00
nate
e03c12eea3 Fixing default input values for form inputs, and adding test case
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4664 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-23 17:32:02 +00:00
phpnut
7cee084212 Refactoring Helper::setFormTag()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4660 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-23 10:50:41 +00:00
phpnut
38577ca149 Adding fix for #2219
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4654 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-23 06:36:24 +00:00