Commit graph

4463 commits

Author SHA1 Message Date
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
8ab5abe852 Merge remote branch 'origin/1.2' into 1.3 2010-03-27 16:28:00 -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
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
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
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
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
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
c1f74c28ae Fixing postgres self join error 2010-03-16 16:49:57 -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
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
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
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
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
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
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
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
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
2218d186c8 Revert "Fixing escaping of forward slash for JS Engines."
This reverts commit 7334fdfbdf.
2010-03-09 14:30:28 +11:00
predominant
7d81d81176 Merge remote branch 'origin/1.3' into 1.3 2010-03-09 12:28:06 +11:00
predominant
7334fdfbdf Fixing escaping of forward slash for JS Engines. 2010-03-09 12:26:25 +11:00
Mark Story
8216f5010c Fixing @see tags in JsEngines 2010-03-06 10:46:26 -05:00
Mark Story
63fcd225ac Fixing doc block @link tags in Model class. 2010-03-05 22:07:39 -05:00
Dieter Plaetinck
3affec58c6 move information about return value to the correct place in the doc block of Model::saveAll()
Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-05 21:47:03 -05:00
Mark Story
af92276ba9 Adding missing reference operators to getInstance methods. 2010-03-05 21:41:48 -05:00
Mark Story
ba06b5b456 Moving call to _getConnectionObjects() inside class_exists check. Removes errors when creating a connection with no DATABASE_CONFIG class. 2010-03-05 21:37:28 -05:00
José Lorenzo Rodríguez
e4a5ca528c Fixing virutal fields fetching for postgresql, closes #417 2010-03-05 16:07:59 -04:30
Mark Story
1d449e3847 Refactoring label generation into a method.
Fixing issues with labels having a for attribute = Array when an array of id's is provided.
Fixing issues where a date input would require you to provide id keys for hour, minute, and meridian even if you were not using them.
Fixes #411
2010-03-04 22:46:43 -05:00
Mark Story
3e275494e1 Removing duplicated condition from merge. 2010-03-03 20:07:23 -05:00
predominant
382e11ccde Changed Configure::write to return true on success. Maked testing result simpler. 2010-03-04 10:20:15 +11:00
José Lorenzo Rodríguez
174108df19 Code cleanup, closes #416 2010-03-03 00:11:32 -04:30
hiromi2424
256ce41b1f LC_TIME support multi-byte value. 2010-03-02 23:51:22 -04:30
Mark Story
ee3c2efec7 Updating version number to 1.3.0-RC1 2010-02-28 20:48:26 -05:00
José Lorenzo Rodríguez
d5fa897681 Adding tests for startupProcess and shutDownProcess in controller
Fixing variable reference
2010-02-28 12:55:35 -04:30
ADmad
8dfadafc88 Changing ternary operator usage syntax to be compliant with php 5.2 and below 2010-02-28 13:05:00 +05:30
Mark Story
e0abe99d7d Merge remote branch 'origin/1.2' into 1.2-merger
Conflicts:
	cake/libs/view/helpers/html.php
	cake/tests/cases/libs/folder.test.php
2010-02-28 01:58:29 -05:00
Mark Story
3f0c0d8848 Adding doc blocks for new methods. 2010-02-28 01:55:23 -05:00
Mark Story
37cf55470f Adding tests for Component::triggerCallback(). Deprecating other Component methods, as they are just wrappers for triggerCallback(). 2010-02-28 01:49:19 -05:00
Mark Story
70c4c05acd Merge branch '1.3-component' into 1.3 2010-02-28 01:39:54 -05:00
José Lorenzo Rodríguez
1f1e0f4ff7 Merge commit 'origin/1.3' into 1.3-form 2010-02-27 23:23:43 -04:30