Commit graph

2611 commits

Author SHA1 Message Date
predominant
e4d292bfa4 Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/console/libs/shell.php
	cake/libs/controller/components/acl.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/security.php
	cake/libs/controller/components/session.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/number.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
2010-04-06 12:19:34 +10:00
Mark Story
518cab91e5 Fixing discrepancy between how belongsTo and hasOne assocations are treated in relation to their fields being added into the queryData. hasOne and belongsTo associations now behave the same. Fixes #379 2010-04-05 21:50:28 -04: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
1497ec3910 Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00
Mark Story
d990c6ed44 Adding tests for single quoted attributes to assertTags(). Because of the __array_permute works ensuring quotes match is a non-trivial problem. Fixing single quoted attributes not being matchable with assertTags(). Fixes #539 2010-04-04 21:43:29 -04:00
predominant
14b6a7ac5e Fixing access to private and protected variables in Xml class. 2010-04-05 08:57:40 +10:00
José Lorenzo Rodríguez
45ccba5d94 Improving virtual fields fetching when the field wildcard selector * in present on the fields array, closes #524 2010-04-04 13:24:39 -04:30
predominant
3039645a17 Fix testing of protected baseConfig in CakeSocket. 2010-04-04 18:34:49 +10:00
predominant
3c2e7a091d Changed access to private __associations on Model to associations() calls. 2010-04-04 18:17:43 +10:00
predominant
97388d2e61 Fixed access to protected property in CakeSession tests. 2010-04-04 17:21:01 +10:00
predominant
850ca02bb6 Changed all public 'var' declarations to be 'public $var' 2010-04-04 17:14:00 +10:00
predominant
329a13fe5f Changed all $_ declared variables to protected. 2010-04-04 16:36:12 +10:00
Mark Story
558a9db642 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-04-02 15:51:00 -04:00
Mark Story
3503872ab8 Fixing Form::dateTime() for GET forms. Tests added. Fixes #522 2010-04-02 15:50:43 -04:00
ADmad
1b8165d890 Enhancing email component to allow using alias for attachments. Closes #6 2010-04-03 00:37:02 +05:30
Mark Story
e6f9c420b6 Removing transactional property from the Set test, as it was removed from the Model in the last commit. Ref #531 2010-04-02 13:55:05 -04:00
Mark Story
d058234c1c Adding tests to PaginatorHelper::sort() for creating sort links that point at plugin shortcuts. Refs #535. 2010-04-02 13:43:03 -04:00
Mark Story
ffb5c36578 Adding tests for plugin shortcut route generation. Refs #535 2010-04-02 13:32:14 -04:00
ADmad
d92202c6da Fixed controller test case which generated a property undefined notice 2010-04-02 00:01:06 +05:30
Mark Story
176c12e5fe Adding tests for creating directories with trailing slashes. Closes #520 2010-03-30 22:35:49 -04:00
José Lorenzo Rodríguez
75900883e6 Making DboPostgres::value() return NULL when given an empty array, as DboMysql does 2010-03-30 00:01:33 -04:30
José Lorenzo Rodríguez
bbf96567eb Using value() in default value generation with CakeSchema and DboPostgres 2010-03-29 23:50:40 -04:30
predominant
84ad35ca7a Added test for XML Helper serialization. Refs #284 2010-03-29 12:21:14 +11:00
Mark Story
068631ebe2 Fixing AclNode::node() so that node expressions that could match deeper elements are contained to their parent elements. Test added. 2010-03-28 16:59:24 -04:00
ADmad
d365fafe4d Changed default value for option 'validate' to 'first' in Model::saveAll(). Also fixed issue where the return array contained more keys then number of records in data array itself with options 'validate =>'first' and 'atomic'=>false 2010-03-28 05:29:42 +05:30
Mark Story
7b28fdec85 Fixing Security::cipher() not being able to correctly decrypt numeric values. Fixes #513 2010-03-27 17:19:42 -04:00
Mark Story
1210a4f598 Fixing whitespacing. 2010-03-27 16:28:59 -04:00
Mark Story
8ab5abe852 Merge remote branch 'origin/1.2' into 1.3 2010-03-27 16:28:00 -04:00
Mark Story
3040c6f586 Moving tests around in set test. 2010-03-27 16:27:23 -04:00
Mark Story
35446a42a9 Making filtering of extracted arrays remember their key. This fixes attribute selectors followed by parent selectors returning seemingly random results. Fixes #502 2010-03-27 16:23:46 -04:00
Mark Story
3075eda8b6 Merge remote branch 'origin/1.2' into 1.3 2010-03-27 14:30:27 -04:00
Mark Story
b559be5822 Moving xml_parser_free() so parser resources are freed immediately after they are used. Helps reduce memory consumption in Xml class. Refs #505 2010-03-27 12:48:31 -04:00
Mark Story
0c29fd0094 Merge remote branch 'origin/1.2' into 1.3
Conflicts:
	cake/libs/cake_session.php
	cake/libs/controller/components/session.php
	cake/libs/model/model.php
	cake/libs/router.php
2010-03-27 11:48:49 -04:00
predominant
9bd0960cf1 Merge remote branch 'origin/1.3' into 1.3 2010-03-26 20:36:04 +11:00
predominant
0dfc07ba0d Fixes #53, ordering of XML::toArray() operations. 2010-03-26 20:30:17 +11:00
predominant
ec3f4b8d34 Fixes #53, ordering of XML::toArray() operations. 2010-03-26 19:59:09 +11:00
Mark Story
888fdd3dd5 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-03-25 23:44:53 -04:00
Mark Story
d20aa23711 Fixing issues where paths added to build() would be appended into the search paths after the default paths.
Fixed issue where paths added with build() would be lost when calling build() again to change a different path type.
Tests updated.
Fixes #410
2010-03-25 23:44:40 -04:00
predominant
5d3f0d7fe0 Fix for Session Component to use CakeSession started() checks. Refs #332. 2010-03-26 14:36:40 +11:00
predominant
9f5949ab52 Fix for Session Component to use CakeSession started() checks. Refs #332. 2010-03-26 14:29:27 +11:00
José Lorenzo Rodríguez
41734503a6 Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
* '1.3' of git@github.com:cakephp/cakephp1x:
  Supporting Model.* syntax on postgres.
  Changing variable $title to $title_for_layout. Closes #511

Conflicts:
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-03-25 16:08:58 -04:30
José Lorenzo Rodríguez
1f1324f500 Qouting fields inside postgres functions when prepended a DISTINCT, closes #512 2010-03-25 16:05:45 -04:30
renan.saddam
dd4ad2f83d Supporting Model.* syntax on postgres. 2010-03-25 17:33:34 -03:00
Mark Story
4f4d3f9ffe Fixing extraction of non-zero arrays with only one element and attribute selectors. Fixes #475 2010-03-24 23:25:02 -04:00
Mark Story
cbb65ca85f Moving failing test into new method for non-zero array extraction. 2010-03-24 22:36:38 -04:00
Jimmy Bourassa
e8e520d6f2 Added test case for a bug in Set::extract
Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-24 22:34:41 -04:00
Mark Story
9d3f2fb4a7 Moving Non-Zero tests for Set::extract() into a separate method. 2010-03-24 22:33:51 -04:00
Mark Story
9334aeabc2 Adding tests for loading helpers off of additional paths. Closes #410 2010-03-24 22:11:53 -04:00
Mark Story
3883f728fb Adding tests for Fixture importing. Fixing importing fixtures for databases that require custom fields handling like postgresql. Fixes #481 2010-03-22 23:28:58 -04:00
Mark Story
817ebf5ec8 Merge remote branch 'ceeram/1.3-467' into 1.3 2010-03-21 20:41:54 -04:00