Commit graph

7397 commits

Author SHA1 Message Date
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
9ef5367219 Minor doc block spacing. 2010-03-26 22:53:30 +11:00
predominant
2decbc7129 Fix $host not being defined on SessionHelper. 2010-03-26 22:53:14 +11:00
predominant
abefca759a Fix $host not being defined on SessionHelper. 2010-03-26 22:51:58 +11:00
predominant
9da921d1d7 Space comment block away from code. 2010-03-26 22:47:20 +11: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
13a55b6cd8 Fixes #332. 2010-03-26 14:35:35 +11:00
predominant
7b17374cad Refs #332. Beginning fix for multiple session starts. 2010-03-26 14:35:23 +11:00
predominant
9f5949ab52 Fix for Session Component to use CakeSession started() checks. Refs #332. 2010-03-26 14:29:27 +11:00
predominant
9740029e9e Fixes #332. 2010-03-26 14:21:08 +11:00
Mark Story
2e11f63bd4 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-03-25 23:02:05 -04:00
Mark Story
a72dabe257 Removing unnecessary variable assignment.
Removing unnecessary parenthesis.
2010-03-25 23:01:50 -04:00
predominant
d95e482894 Refs #332. Beginning fix for multiple session starts. 2010-03-26 10:46:48 +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
ADmad
12e608c671 Changing variable $title to $title_for_layout. Closes #511 2010-03-26 01:03:48 +05:30
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
1230b83438 Fixing incorrect string concatenation resulting in invalid conditions. Fixes failing tests. 2010-03-22 22:26:32 -04:00
ADmad
209af202ec Optimizing Sanitize::html() by caching default charset. Closes #496. Also charset passed in $options parameter now takes precedence over the default value obtained from app's config value 'App.encoding' 2010-03-23 00:40:53 +05:30
Mark Story
817ebf5ec8 Merge remote branch 'ceeram/1.3-467' into 1.3 2010-03-21 20:41:54 -04:00
Mark Story
8f20b12c58 Expanding the documentation related to showParents and options. Fixes #479. 2010-03-20 19:43:52 -04:00
Juan Basso
5e8665cd8d Allowing routes to set an extension when Router::parseExtension() is
being used.  Fixes #492

Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-20 19:23:48 -04:00
Matt Curry
cc59b04ad3 fixed bad path for css on windows
Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-20 19:01:52 -04:00
Mark Story
8a4ad9f51a Fixing clearCache() so it doesn't delete files named 'empty'. Applies Ceeram's changes without modifying the entire file. Fixes #469 2010-03-20 18:54:35 -04:00
Ceeram
6d13f0d3d1 added test for ticket #469
Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-20 18:22:42 -04:00
Mark Story
0cc1e4c56e Adding import for String to ensure that String has been loaded when Security component is used without making any database connections. Fixes #482 2010-03-20 18:18:24 -04:00
Mark Story
6c8ce984aa Adding import for String to ensure that String has been loaded when Security component is used without making any database connections. Fixes #482 2010-03-20 18:15:52 -04:00
Phally
7f7315e6d2 Added alphabetic sorting to the plugin list in the test suite.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-20 17:48:03 -04:00
ADmad
76af3b9e81 Fixing docblock for Inflector:rules() 2010-03-20 23:06:51 +05:30
Mark Story
d75e4b0d5f Updating documentation for Router::normalize(). Refs #486 2010-03-19 20:45:45 -04:00
Mark Story
45ef3c6151 Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2 2010-03-19 20:44:42 -04:00
Mark Story
f65cb31cbe Updating documentation for Router::normalize(). Refs #486 2010-03-19 20:44:18 -04:00
predominant
e595d81102 Removing returns from File::__construct 2010-03-19 14:10:10 +11:00
Ceeram
71e2fb533d fix for ticket #467 setting correct defaults when userModel is a plugin
model
2010-03-19 01:49:41 +01:00
Ceeram
7337c12f4f test for ticket #467 2010-03-19 01:48:28 +01:00
ADmad
4012925a26 Fixing docblock for pr() 2010-03-18 03:50:14 +05:30