Commit graph

4102 commits

Author SHA1 Message Date
Mark Story
5046382e7d Merge branch '1.3-misc' of github.com:cakephp/cakephp1x into 1.3-misc 2010-01-02 00:07:51 -05:00
Mark Story
7dcf66dd95 Removing dynamic calling of setTablePrefix(). tableprefix should be with the tablePrefix property, and any other custom construction behavior should be done in an overridden Model::__construct. 2010-01-02 00:07:31 -05:00
Mark Story
eab706e772 Correcting and improving doc block for Model::__construct. 2010-01-01 23:59:36 -05:00
ADmad
5f987a4996 Controller data is now set to an array instead of Xml object if request content type is 'application/xml' 2009-12-31 17:36:58 +05:30
Mark Story
41e6fdf346 Merge remote branch 'fahad/1.3-l10n' into 1.3-misc 2009-12-29 23:39:08 -05:00
Mark Story
49e9550482 Merge branch '1.3' into 1.3-misc 2009-12-29 22:07:23 -05:00
Mark Story
32683d3d64 Fixing issues in PrototypeEngineHelper where parameters would end up wrapped in a function() {} when marked as a dataExpression. This prevented the sending of form data.
Tests added.
Fixes #142
2009-12-29 21:52:59 -05:00
Ali Farhadi
0e8f83e103 Adding direction var and __l10nCatalog key to L10n class, fixes #4 2009-12-30 00:23:35 +03:30
Mark Story
93ced3be46 Casting return of Validation::ip to always be a boolean when filter_var is used. It used to return the input string which could cause issue with identity checks. 2009-12-29 11:04:58 -05:00
Mark Story
a9e1d0d7ff Optimizing Sanitize::html() to use str_replace instead of preg_replace. 2009-12-28 22:56:21 -05:00
Mark Story
b68d2a32bf Merge branch '1.3' into 1.3-misc 2009-12-28 22:15:52 -05:00
Mark Story
3ad4dd63bf Removing unused variables from CacheHelper::cache()
Removing non-existant variable output from generated cache files.
2009-12-28 22:15:07 -05:00
Mark Story
2db479dc90 Making CacheHelper create $this->Html style helper references. 2009-12-28 21:58:56 -05:00
Mark Story
6749e1166b Making cacheAction array settings use action names instead of url paths. This removes the ability to set different durations for specific passed arguments. However, makes passed args, named params, and querystring params all behave the same in regard to cacheAction. Test cases updated. 2009-12-28 21:26:51 -05:00
Mark Story
b89280a916 Fixing test failures caused by changes in Cache::__loadEngine().
Adding tests for Cache::config().
2009-12-28 13:52:50 -05:00
Mark Story
45a3eb250f Starting refactoring of cachehelper to use Router::reverse to generate check/match strings. Removing dead code as well. 2009-12-28 13:38:36 -05:00
Mark Story
df8914b2e4 Router::reverse now removes models and paging keys that controllers can insert into params arrays. 2009-12-28 13:34:05 -05:00
Mark Story
5b78a662e8 Adding tests for querystring reversal. 2009-12-27 23:10:29 -05:00
Mark Story
886cd9e719 Adding Router::reverse and basic test case. 2009-12-27 23:09:26 -05:00
tPl0ch
1eff024e7e Removed unnessecary connect keys from all Dbo's _baseConfig. Updated connect methods where needed. Fixes #132
Signed-off-by: Mark Story <mark@mark-story.com>
2009-12-27 12:47:52 -05:00
Mark Story
8b93235847 Fixing auto merge issues. 2009-12-27 12:45:34 -05:00
Mark Story
7a620b62b0 Merge branch '1.3-misc' into mergers
Conflicts:
	cake/libs/model/datasources/dbo_source.php
	cake/libs/view/helpers/js.php
2009-12-27 12:45:12 -05:00
Mark Story
6b2154d961 Merge branch '1.2' into mergers
Conflicts:
	cake/libs/inflector.php
	cake/tests/cases/libs/model/model_validation.test.php
2009-12-27 12:34:27 -05:00
predominant
19924501d1 Updating Inflector to employ internal caching.
Refs #23
2009-12-25 18:53:38 +11:00
Joël Perras
173b4e7b5d Merge branch '1.3-misc' of github.com:cakephp/cakephp1x into 1.3-misc 2009-12-22 23:53:01 -05:00
Joël Perras
8eb9f9e8fd Implenting IPv6 validation using filter_var(), with a regex-based fallback if the aforementioned function does not exist (PHP < 5.2). Fixes #38. 2009-12-22 23:52:06 -05:00
Mark Story
20c02e39d6 Adding doc block for options on NumberHelper::currency() 2009-12-22 19:17:23 -05:00
Mark Story
0b558c6eb0 Adding code to make tests from previous commit pass. 2009-12-22 19:12:11 -05:00
Mark Story
1a387e6b8a Fixing url parameters set with options() or beforeRender not being merged on next() / prev().
Tests added. Fixes #129
This reverses the change made in efa36abdf0 which broke this behavior.
2009-12-22 19:05:06 -05:00
Mark Story
425dcf2df5 Applying patch from 'tPl0ch', connect key is set to 'mysql_connect' when not using persistent connections. Fixes #132 2009-12-22 13:23:55 -05:00
Mark Story
c00cebb0c3 Removing doc for param that no longer exists. 2009-12-21 09:54:35 -05:00
ceeram
6d8fa76bed edit of docblock
Signed-off-by: Mark Story <mark@mark-story.com>
2009-12-21 09:52:33 -05:00
Mark Story
5274dce9f1 Making set vars with Js->set go to the top of the buffered scripts array. Tests added.
Updating doc blocks for JsHelper and JsBaseEngineHelper.
Fixes #131
2009-12-21 09:41:36 -05:00
Mark Story
42fa6ff04a Fixing JsHelper::writeBuffer when inline is set to false. Scripts are now enclosed in a script tag. Fixes #130 2009-12-21 09:29:28 -05:00
Mark Story
850b95900b Adding fix for Cache causing App to do an directory scan when importing a core cache engine. Since these operations occurred before the core configurations had be set, a directory scan was done on every request. This change also makes in not possible to override the core cache engines with app versions. 2009-12-20 18:11:18 -05:00
Mark Story
2e96bfe833 Merge branch '1.3-misc' of git@github.com:cakephp/cakephp1x into 1.3-misc 2009-12-20 16:50:48 -05:00
Mark Story
34410de7c8 Adding property definition for Model::$virtualFields 2009-12-20 16:26:12 -05:00
ADmad
01c31596c8 Cleaning up commented code 2009-12-21 02:50:39 +05:30
ADmad
d561405daa Renaming RequestHandler::getReferrer to RequestHandler::getReferer for (mis)spelling consistency and deprecating the former 2009-12-20 23:06:28 +05:30
ADmad
f36e5eff5f Merge branch '1.3-misc' of github.com:cakephp/cakephp1x into 1.3-misc 2009-12-20 13:22:43 +05:30
Mark Story
c669f8c998 Fixing failing tests in AuthComponent because of required parameter. 2009-12-19 19:58:55 -05:00
Mark Story
4ac0a55aff Merge branch 'virtual-fields' into 1.3-misc
Conflicts:
	cake/tests/cases/libs/controller/controller.test.php
2009-12-19 19:40:12 -05:00
ADmad
cea102c357 Updating doc block to reflect that url can be string or array and removing 'escapeTitle' param. Use key 'escape' in options instead 2009-12-20 00:46:47 +05:30
Mark Story
071c6f0e8b Merge branch 'sql-dump' into 1.3-misc 2009-12-19 13:32:01 -05:00
Mark Story
42e13edd85 Adding file header to sql dump element. 2009-12-19 13:24:00 -05:00
Mark Story
13ffcbc0ba Updating doc blocks in Datasource. Adding missing reference operators. 2009-12-19 13:23:46 -05:00
Mark Story
7387cfdf6b Adding @access tags and expanding doc blocks. 2009-12-19 13:06:32 -05:00
Mark Story
7fd9b5ae3b Removing auto dump of sql log. 2009-12-19 12:40:32 -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
a89fcba243 Updating DboSource::getLog() and showLog() to use a View element.
Updating tests to reflect changes in getLog()
2009-12-19 12:09:01 -05:00