Commit graph

6858 commits

Author SHA1 Message Date
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
ADmad
e2113e4aa2 Minor optimization in DboSource::__scrubQueryData(), removing unneded isset() check. 2010-03-18 03:02:58 +05:30
ADmad
6a723bb515 Type casting conditions array to avoid warning during array merge in Model::_deleteDependent(). Fixes #477 2010-03-18 02:51:55 +05:30
José Lorenzo Rodríguez
93ac79d4fb Chaging array_push call for array_merge, as the first one would produce worng nested arrays in MediaView. closes #391 2010-03-17 16:45:39 -04:30
José Lorenzo Rodríguez
0f876e1a1b Merge branch 'saveAll' into 1.3
* saveAll:
  Making saveAll() behave like plain save() when suplied empty data array, closes #277
2010-03-17 16:40:26 -04:30
José Lorenzo Rodríguez
5c186d4430 Making saveAll() behave like plain save() when suplied empty data array, closes #277 2010-03-17 15:19:30 -04:30
José Lorenzo Rodríguez
c3aec39d75 Chaging array_push call for array_merge, as the first one would produce worng nested arrays in MediaView. closes #391 2010-03-17 10:47:03 -04:30
José Lorenzo Rodríguez
28cb57a92c Fixing bug in Model::escapeField() where it would return the wrong string id the datasource's name method returs the unmodified string.
Tests added. Closes #473
2010-03-17 10:32:36 -04:30
AD7six
bc990f41e3 Prevent sql error for uuids if id is specified as null
if the primary key is present in the data to be saved as null - prevent
passing the same key (id) twice and therefore triggering an sql error.

Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-16 22:57:37 -04:00
José Lorenzo Rodríguez
cceb568520 Skiping some test in model_write test when using postgres as there is no way yet to do joins inside an update statement.
Possible enhancement would be transforming the join conditions into subquerys
2010-03-16 18:46:04 -04:30
José Lorenzo Rodríguez
85f5750c81 Changing fixture data to avoid postgres error. Manually inserted id does not increment sequence 2010-03-16 18:09:27 -04:30
José Lorenzo Rodríguez
c51f4076f7 Forcing order on find('all') in test. It is not safe to asume returned row order in postgres 2010-03-16 17:00:20 -04:30
José Lorenzo Rodríguez
c1f74c28ae Fixing postgres self join error 2010-03-16 16:49:57 -04:30
José Lorenzo Rodríguez
201a952218 Fixing test for postgresql, it is no safe to asume the order of the returned results of a joined table 2010-03-16 15:12:27 -04:30
Mark Story
8375570f8a Removing useless loop in Model::save() 2010-03-15 23:36:20 -04:00
AD7six
0c951b7248 Prevent sql error for uuids if id is specified as null
if the primary key is present in the data to be saved as null - prevent
passing the same key (id) twice and therefore triggering an sql error.

Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-15 23:32:46 -04:00
Mark Story
4861da66ed Merge remote branch 'origin/1.2' into 1.2-merger
Conflicts:
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-03-15 23:26:24 -04:00
Mark Story
01a5738f3c Effectively reverting changes made in
[190066fd51] which caused conditions using
a falsey values to be removed.
2010-03-15 23:14:23 -04:00
Mark Story
661fcd32ab Fixing failing tests in PostgreSQL cause by invalid datatype comparisons and missing id fields. 2010-03-15 23:07:18 -04:00
Mark Story
ea64588a81 Adding tests from 'Stephen Cuppert' to test incorrectly generate DELETE queries for habtm join tables that do not have a primary key when using PostgreSQL. Updating DboSource::_matchRecords() to only query the table if the supplied conditions are actually multi-table conditions. Fixes #459 2010-03-15 22:55:14 -04:00
Mark Story
190066fd51 Adding array_filter() to remove empty conditions that can be caused by array casting an empty string. 2010-03-15 22:15:03 -04:00
ADmad
cadac9c242 Minor optimization in Inflector::rules, using 'plus'(+) operator instead of 'array_merge' to merge transliteration map arrays 2010-03-16 00:35:05 +05:30
Mark Story
5e665b32f2 Removing useless condition in DboSource::cacheMethod() 2010-03-15 00:41:44 -04:00
Mark Story
daf02cad61 Fixing CakeSchema index comparison that was causing failures in postgres tests. 2010-03-14 23:31:52 -04:00
Mark Story
3ab687043e Updating DboPostgres test to reflect changes in test suite. 2010-03-14 19:27:36 -04:00
Mark Story
edf2ea1e74 Updating version numbers to 1.3.0-RC2 2010-03-14 16:44:54 -04:00
ADmad
70d0c64283 Removing constant REQUEST_MOBILE_UA, and added variable $mobileUA instead for mobile browser detection. Also added new user agent string 'webOS', closes #457 2010-03-15 01:58:38 +05:30
Mark Story
4c7b62bf64 Removing pre-beta deprecated method that was missed in last Release candidate 2010-03-14 16:07:29 -04:00
Mark Story
3d4b1e365d Removing deprecated method missed in last release candidate. 2010-03-14 16:06:31 -04:00
Mariano Iglesias
1120d0daff Fixing issue in Containable where if bindModel was used to add / change a binding not permanently, Containable was making the change permanent 2010-03-14 16:37:50 -03:00
Mariano Iglesias
8d58b40642 Fixing issue in Containable where if bindModel was used to add / change a binding not permanently, Containable was making the change permanent 2010-03-14 16:34:57 -03:00
Mark Story
a51cceab18 Merge branch 'dbo-source-cache' into 1.3 2010-03-14 15:11:48 -04:00
Mark Story
5ec965830c Fixing issues caused by daylight savings time switch. 2010-03-14 13:20:52 -04:00
Mark Story
78f347afd7 Fixing SchemaShell test, was failing due to a model in the test_app changing. 2010-03-14 13:06:22 -04:00
Mark Story
32432e8de6 Updating DboSource::conditions() to use cacheMethod(). Refs #458 2010-03-13 23:00:08 -05:00
Mark Story
c059cf5175 Implementing cacheMethod(). Helps to solve #458, as it provides features to control and clear method caches. 2010-03-13 22:55:18 -05:00
Mark Story
49c60658b9 Fixing the ability to use regular expressions for validation rules. Fixes #453 2010-03-13 19:44:20 -05:00
ADmad
688daf2c35 Allowing the default transliteration map used in Inflector::slug to be customized using Inflector::rules. Closes #321, #334, #439. 2010-03-14 02:22:46 +05:30
Mark Story
178099d15b Adding test that closes #455 2010-03-13 00:26:23 -05:00
Mark Story
028668b7a6 Adding condition for counterCache update keys. Fixes issues where counter cache wouldn't be updated. Fixes #450 2010-03-13 00:18:51 -05:00
Mark Story
e304c48ec4 Adding test to show that select() doesn't always auto select options named 'Array'. Disproves #412 2010-03-12 23:17:11 -05:00
Mark Story
677ff2d8b7 Removing outcommented code. 2010-03-12 23:03:06 -05:00
Mark Story
8e8acfaccd Fixing notice errors when bogus validation options are selected. Refs #453 2010-03-12 22:58:14 -05:00
Mark Story
239e34f032 Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2 2010-03-10 21:49:55 -05:00
Mark Story
64c627a352 Adding checks to force limit to always be a positive integer. Fixes potential out of bounds type queries with paginate(). Fixes #418 2010-03-10 21:49:22 -05:00
Mark Story
4c668c036c Adding checks to force limit to always be a positive integer. Fixes potential out of bounds type queries with paginate(). Fixes #418 2010-03-10 21:46:28 -05:00
José Lorenzo Rodríguez
d8a757ce75 Fixing empty value check to avoid a mistaken default value selection in Helper::value. closes #290 2010-03-10 15:16:02 -04:30
Dieter Plaetinck
9a9bc3643b fix typo in DboPostgresTestDb::testOrderAdditionalParams() 2010-03-10 14:34:17 -04:30
José Lorenzo Rodríguez
cbcd394d0b Fixing alter schema queries generated for Postgres, which dos not support altering column type, nullable and default value at the same time 2010-03-09 16:09:16 -04:30
José Lorenzo Rodríguez
acccf964a5 Fixing some tests for Postgres Dbo and adding test cverage for extra params in order function, closes #353 2010-03-09 15:24:03 -04:30
Dieter Plaetinck
a79ff508a6 fix compliancy with more elaborate ORDER syntax, such as "DESC NULLS FIRST" in postgresql, in DboSource::order() 2010-03-09 14:12:54 -04:30
Mark Story
af317a107b Fixing issues in Set::combine() when data or paths used result in empty datasets. Tests added. Fixes #414 2010-03-08 23:07:36 -05:00
Mark Story
bed4027d37 Making JsHelper::writeBuffer() use the isAjax param to hint the domReady() event. Disabling domready events when the request isAjax fixes issues in prototype and makes output code simpler. Fixes #429 2010-03-08 22:51:46 -05:00
Mark Story
41bdc48fd3 Fixing whitespacing. 2010-03-08 22:49:09 -05:00
Mark Story
c874d98195 Minor refactor to use local variable. 2010-03-08 22:48:39 -05:00
predominant
9cc460ce6d Merge remote branch 'origin/1.3' into 1.3 2010-03-09 14:31:16 +11:00
predominant
2218d186c8 Revert "Fixing escaping of forward slash for JS Engines."
This reverts commit 7334fdfbdf.
2010-03-09 14:30:28 +11:00
Mark Story
f8bc6de4ae Fixing ViewTask and FixtureTask. $interactive was set to false, and methods were auto quitting. Fixes #437 2010-03-08 21:18:53 -05:00
predominant
7d81d81176 Merge remote branch 'origin/1.3' into 1.3 2010-03-09 12:28:06 +11:00