Commit graph

205 commits

Author SHA1 Message Date
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
a292ef0f16 Adding ability to provide default plugin value to pluginSplit(). 2009-11-15 19:54:33 -05:00
mark_story
20a114a1cd Adding $dotAppend to pluginSplit() 2009-11-15 19:12:00 -05:00
mark_story
db0c030557 Adding pluginSplit and test case. pluginSplit consolidates a number of repeated code blocks. 2009-11-15 18:16:12 -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
0657afcf30 Removing use of low() from core classes. Refs #6525 2009-10-21 13:03:24 -04:00
mark_story
a3cd80bf52 Merge branch '1.3-bake' into 1.3 2009-09-20 17:42:43 -04:00
mark_story
5717e3b59c Merge branch '1.2' into 1.2-merger
Conflicts:
	app/webroot/test.php
	cake/VERSION.txt
	cake/bootstrap.php
	cake/config/config.php
	cake/console/cake.php
	cake/console/libs/schema.php
	cake/console/templates/skel/webroot/test.php
	cake/libs/configure.php
	cake/tests/cases/console/libs/schema.test.php
	cake/tests/cases/libs/debugger.test.php
	cake/tests/cases/libs/model/model_write.test.php
	cake/tests/fixtures/aco_fixture.php
2009-09-16 01:23:49 -04:00
mark_story
b75779ec06 Updating documentation for __xxx methods. Updating LC_* doc references. Updating other doc blocks for various methods in basics.php Fixes #2. 2009-09-07 00:18:08 -04:00
mark_story
30f8709bb4 Removing use of low() in core classes and functions. Refs #6525 2009-08-27 22:46:00 -04:00
gwoo
6775e0997e Merge branch '1.2' into 1.3 2009-08-03 13:13:18 -07:00
mark_story
72d90f2ce8 Adding tests for array_diff_key() in php4. Increasing test compatibility with php4
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8281 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-03 19:24:38 +00:00
gwoo
bf2b8a60e6 Merge branch '1.3-misc' into 1.3 2009-08-02 12:20:07 -07:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
jperras
d70900c540 Making basics.test.php testDebug more symlink friendly. Adding deprecated tag to global 'uses' method 2009-07-23 16:51:25 -04:00
mark_story
7ca85109cb Updating env(HTTPS); to more accurately reflect the PHP $_SERVER docs. Fixes #6524
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8246 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-22 13:40:12 +00:00
gwoo
508f0651a4 fixes #6492, removing use of define LC_MESSAGES due to inconsistency on different operating systems
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8223 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-06 15:30:04 +00:00
gwoo
72546f3839 fixes #6455, adding define for LC_MESSAGES
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8221 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-05 15:02:03 +00:00
gwoo
7818eae206 fixes #6455, i18n locale message category bug
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8218 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-03 15:54:26 +00:00
gwoo
a903a4527f fixes #6359, array_intersect_key compatibility with php4
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8196 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-16 20:22:41 +00:00
john
0d86c4f7b5 Updating docblocks and including new @link tags.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7812 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-31 19:44:23 +00:00
AD7six
3f2fa6929b changing tabs for spaces in comment block indentation
Removing address and replacing with cakefoundation url


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
mark_story
1b456f2cf1 Applying patch from 'davidpersson' fixing code spacing. Closes #5643
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7772 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 00:10:44 +00:00
renan.saddam
6a33ca5b5b Adding tests to __* functions and doing a little refactoring to reduce overload.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7753 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-16 01:11:09 +00:00
AD7six
2cb2ca554c Correcting env('HTTP_BASE') ensuring that when used with no subdomain (http://example.com) it does not return '.com' as the HTTP_BASE
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7679 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-29 18:01:52 +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
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
9e9775ee53 Fixing clearCache() no notices are generated. Closes #5012
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7416 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-01 23:46: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
mark_story
551cf75bbc Added check for empty array, removes warning. Closes #5012.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7299 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-29 21:26:37 +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
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
the_undefined
f6aa0e0a09 Marked paths() function as deprecated, closes #4615
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6955 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-19 07:09:53 +00:00
the_undefined
d64bf9b3d8 Marked old cache function as deprecated
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6914 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-17 21:44:17 +00:00
nate
c40bead47c Adding charset/encoding settings to h(), closes #4040
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6541 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-09 21:41:13 +00:00
phpnut
7978745056 "Closes #4029 clearCache deletes more files than expected"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6513 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-08 04:30:55 +00:00