Commit graph

3477 commits

Author SHA1 Message Date
DarkAngelBGE
f88cc56cfe Coding standards fixes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8260 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-28 20:01:42 +00:00
mark_story
47cd941b53 Applying optimization patch to PaginatorHelper and test refactorings to PaginatorHelper test case. Thanks Phally. Fixes #6526
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8259 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-28 12:40:31 +00:00
DarkAngelBGE
9da7b6ef55 Bringing Router coverage up to 94.45%, minor router refactorings
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8258 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-28 09:49:27 +00:00
AD7six
3b1664b7dd Preventing loading the ConnectionManager from triggering reloading the Model file 2009-07-28 08:36:55 +02:00
mark_story
75026715d1 Adding additional tests to Request and updating callback argument list. 2009-07-28 00:04:43 -04:00
mark_story
2e82d229b7 Adding variable declaration. 2009-07-27 22:37:14 -04:00
mark_story
ebc221dbf7 Updating sortable options.
Fixing drag() when selector is a multiple element selection.
2009-07-27 22:36:22 -04:00
mark_story
ec10e90efb Merge branch '1.3' into 1.3-jshelper 2009-07-27 12:11:43 -04:00
mark_story
cde9afb486 Updating Mootools engine to work seamlessly with $() and $$() type selections. 2009-07-27 08:45:31 -04:00
mark_story
7246563bae Adding newlines 2009-07-26 21:58:58 -04:00
AD7six
fd0aaefb39 whitespace normalization 2009-07-26 12:46:07 +02:00
gwoo
062f471b7f updating App::import usage. ran each test and everything seems ok. 2009-07-25 18:27:02 -07:00
gwoo
df6d62764f updating App::objects cache support 2009-07-25 15:57:49 -07:00
mark_story
d4d9db43a7 Updating PrototypeEngineHelper::request() to use dataExpression. Allowing Js::submit() to work with prototype. 2009-07-25 18:12:53 -04:00
mark_story
dda6c93529 implementing serializeForm() in Prototype engine. 2009-07-25 18:02:54 -04:00
mark_story
def4c98a08 Merge branch '1.3' into 1.3-jshelper
Conflicts:
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/js.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/lib/header.php
2009-07-25 17:35:27 -04:00
mark_story
6f10f5de6d Fixing issues with ajax forms and mootools. post needs to be lowercase.
Implementing serializeForm() in MootoolsEngine.
Updating doc blocks.
2009-07-25 17:10:22 -04:00
mark_story
2414a43c91 Adding HtmlHelper::scriptStart and HtmlHelper::scriptEnd. Further deprecates JavascriptHelper. Fixing issues in test case. 2009-07-25 15:43:26 -04:00
gwoo
cfb46024d7 fixing Configure where Set is not found.also adding to CakeSession 2009-07-25 12:32:02 -07:00
jperras
54d1577276 Adding tests for Inflector::slug with non-latin characters & removing redundant element in preg_replace map. 2009-07-25 15:10:21 -04:00
jperras
659c1a65bc Modified Inflector::slug to not drop multibyte characters. Fixes #6104. 2009-07-25 14:25:45 -04:00
gwoo
766e12bc2a Merge branch '1.3' into 1.3-newlines 2009-07-25 10:41:40 -07:00
gwoo
1924eb9dde updating configure and debugger 2009-07-25 10:27:17 -07:00
mark_story
4ebf5a4e32 Merge commit 'code/1.3' into 1.3-jshelper
Conflicts:
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/lib/header.php
2009-07-25 01:35:36 -04:00
mark_story
9a66c2cfc5 Fixing method param in jQuery engine. Needed to be converted to 'type'.
Fixing issues in JsHelper::submit() related to data being escaped.
Updating tests cases.
2009-07-24 23:29:44 -04:00
mark_story
49e0e5743f Adding tests for custom url on submit() 2009-07-24 22:54:22 -04:00
mark_story
e8b39fb9a5 Updating docs for serializeForm.
Making url for form js more flexible.
2009-07-24 22:47:08 -04:00
mark_story
36722c0ef2 Implementing serializeForm() in jquery engine. 2009-07-24 22:46:33 -04:00
mark_story
76c13fa98e Adding non buffered tests to Js::link()
Implementing Js::submit() adding test cases.
2009-07-24 22:13:54 -04:00
gwoo
986af28de0 Merge branch '1.2' into 1.3 2009-07-24 15:57:30 -07:00
gwoo
9a909c553f updating configure to handle infinite depths of keys. thanks to farhadi. 2009-07-24 13:50:50 -07:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
jperras
e40428801e Removing all uses of uses() global method & replacing with require or App::import. 2009-07-24 13:41:08 -04:00
DarkAngelBGE
8f61c666c2 Removing usage of r() from core
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8252 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-23 20:51:24 +00:00
gwoo
61c2c3009d updating session requires and removing deperacted method from text helper 2009-07-23 13:07:03 -07:00
gwoo
30281d6c59 fixes #6506, notice on 5.2.10 for habtm save with empty value
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8251 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-23 19:28:46 +00:00
mark_story
93d64c4e76 Removing use of e() from core classes. Refs #6525
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8250 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-23 13:35:14 +00:00
gwoo
a9d98e73c3 Merge branch '1.2' into 1.3 2009-07-22 09:27:31 -07:00
gwoo
f295a21831 updating some code related to Configure/App changes. Fixing issue when cache is not configured 2009-07-22 09:11:38 -07:00
DarkAngelBGE
3e14d281df fixes #6397, removing unneeded line feed in email component headers, adding tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8248 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-22 16:04:53 +00:00
DarkAngelBGE
07096f3bcc fixes #6403, removing unreachable code in router
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8247 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-22 14:37:50 +00:00
DarkAngelBGE
d6a12ce5f1 2nd param init value for Router::stripPlugin(), improving router's coverage by adding tests for stripPlugin()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8245 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-22 13:02:31 +00:00
nate
a75d1fad2a Modifying quoting method used in conditions with array values in DboSource, fixes #6519
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8243 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-22 01:50:11 +00:00
DarkAngelBGE
caeac73562 Applying patch from ' matsinet', fixes #6475, EmailComponent ignoring sendAs when attachments present, adding tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8242 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-21 21:54:05 +00:00
DarkAngelBGE
fefbe77208 Minor refactorings for DboMysql, DboSource and TextHelper
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8241 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-21 20:57:39 +00:00
mark_story
a3d5a9beae Adding stubs for JsHelper::submit() 2009-07-21 00:24:58 -04:00
gwoo
56bee6e1fc fixes #6507 paginator sort directions
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8239 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-21 01:53:14 +00:00
gwoo
4cfdd311a9 fixes #6476, crash on missing layout in session flash
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8238 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-21 01:33:12 +00:00
gwoo
a2f0ab8b27 Merge branch '1.2' into 1.3 2009-07-20 09:31:56 -07:00
mark_story
d2245fd514 Fixing Router::normalize() so that a url containing the base param more than once, which is passed into normalize() multiple times does not get url segments removed. Fixes #6338 and #5978
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8236 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-20 13:18:38 +00:00
mark_story
74fd4849ba Fixing issue in Router where generating plugin shortcut controller routes with admin prefixes left a :controller param behind. Fixes #6252
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8235 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-17 21:35:23 +00:00
mark_story
76d5855d72 Applying patch from 'Phally' Fixes multiple issues in PaginatorHelper related to first and last option in numbers(). Fixes #6516
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8234 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-17 19:46:33 +00:00
mark_story
a5bfe72bd2 Updating file header and doc blocks. 2009-07-17 00:10:48 -04:00
mark_story
4a4b9eefe5 Updating file headers.
Removing newlines.
2009-07-17 00:09:06 -04:00
renan.saddam
7fd6cc52c2 Fixing issue with timeout when reading socket.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8233 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-15 19:17:41 +00:00
renan.saddam
3b872a218e Removing supressing errors from HttpSocket, using condition instead. Fixes #6483.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8232 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-15 19:15:14 +00:00
mark_story
baea319122 Applying patch from 'Dremora' fixes JavascriptHelper::codeBlock() and blockEnd() bugs where content vanished due to incorrectly structured buffers. Minor behavior change in that codeBlock(null) no longer returns an opening script tag. The entire script tag is returned when blockEnd() is called.
Test cases updated and refactored.
Fixes #6504


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8231 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-14 17:11:46 +00:00
mark_story
02ed77ab20 Adding tests for calling RequestHandlerComponent::renderAs() twice.
Fixing issue where viewPath was not updated.
Fixes #6466

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8230 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-14 03:52:06 +00:00
mark_story
04fa46f228 Updating Js::link() adding confirm option. 2009-07-12 18:42:36 -04:00
mark_story
5119e58e3b Starting work on Js::link() 2009-07-12 17:30:41 -04:00
mark_story
69de1291e1 Removing deprecated options from object()
Tests updated.
2009-07-11 17:31:54 -04:00
mark_story
50c624486e Updating tests to reflect changes in json encoding. 2009-07-11 17:21:06 -04:00
jperras
4f44a15470 EmailComponent::reset now empties out attachments array. Fixes #6498.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8226 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-10 00:07:51 +00:00
mark_story
fb6b16c467 Fixing empty time value handling in Model::deconstruct(). Both null and 00:00:00 are valid values now. Test cases added and refactored. Fixes #6488, #6018, Refs #5659
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8225 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-08 03:25:30 +00:00
mark_story
9c51f720ed Merge branch '1.3' into jshelper-integration
Conflicts:
	cake/tests/cases/libs/view/helpers/js.test.php
2009-07-06 23:43:57 -04:00
gwoo
508f0651a4 fixes #6492, removing use of define LC_MESSAGES due to inconsistency on different operating systems
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8223 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-06 15:30:04 +00:00
davidpersson
68d333d088 Applying patches by ADMad updating HtmlHelper and adding test. Adding missing properties in test case. Preventing bleed through in test case. Fixes #6490
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8220 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-04 22:04:40 +00:00
gwoo
7818eae206 fixes #6455, i18n locale message category bug
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8218 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-03 15:54:26 +00:00
gwoo
f1a4352620 Merge branch '1.2' into 1.3 2009-07-03 08:24:42 -07:00
gwoo
f2b7a26be8 fixes #5710, HABTM - constraining unique ids, but removing non-unique
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8217 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-03 03:31:05 +00:00
mark_story
45a51ed809 Changing return of Model::deleteAll(). When no records are matched by the delete conditions return is now (bool)true as no records matching those conditions exist.
Test case added.
Fixes #6453

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8216 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-03 00:26:58 +00:00
mark_story
f79a68b2a6 Minor refactor of variable names.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8215 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-03 00:20:54 +00:00
gwoo
8971aad8bf closes #6413, scaffoldFields not working with add/edit methods
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8214 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-03 00:14:36 +00:00
gwoo
9e143bc335 fixes #6473, dot notation for sort in next/prev
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8213 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-02 23:48:10 +00:00
gwoo
92b8e87ed7 fix for cross database joins when recursive < 1
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8212 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-02 23:14:38 +00:00
gwoo
2ba8e8777c Merge branch '1.2' into 1.3 2009-07-02 16:12:50 -07:00
gwoo
3c76f173f7 removing deprecated model methods 2009-07-02 10:24:42 -07:00
gwoo
bc359259a2 Merge branch '1.2' into 1.3 2009-07-02 09:27:00 -07:00
jperras
a6d3193a6d Updated EmailComponent::__strip regex for mailto: links. Fixes #6464.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8211 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-02 02:58:43 +00:00
jperras
c30dd48e2a Updating doc block for Set::combine first parameter - may accept an object as first param, in addition to arrays.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8210 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-01 22:25:22 +00:00
mark_story
975e4452d2 Fixing Xml parsing where multiple child elements of the same name, with no value are collapsed causing data errors when Xml object was converted to an array. Test cases from 'burzum' added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8209 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-01 18:58:05 +00:00
mark_story
ff5d9ed6e0 Fixing issues created in [8205] where allowedActions check was done incorrectly. Fixes #6482
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8208 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-01 03:56:16 +00:00
gwoo
8f801a975d Merge branch '1.3-configure' into 1.3 2009-06-30 20:04:25 -07:00
gwoo
58b5c0d77d cleaning up some ;; 2009-06-30 19:56:15 -07:00
mark_story
fd7cf5e5e6 Adding test cases for boolean and boolean-ish values. Fixes false being converted to '' when using Xml::toString().
Fixes #6478

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8206 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-30 01:14:20 +00:00
mark_story
8c7883fe3e Fixing camel cased methods in checks for allowedActions in AuthComponent under PHP5. Normalizes to lowercase method name. Fixes #6142
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8205 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-30 00:25:09 +00:00
mark_story
6a34c9ef31 Fixing Model::saveAll() PHP4 compatibility. Minor API change in __save(). __save() no longer takes a model instance as the first parameter. Because of Model implementation details in PHP4 this caused broken references. Fixes #6389, #6223
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8204 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-27 15:25:07 +00:00
gwoo
13550a140a fixing require cake_session in session component 2009-06-24 15:05:08 -07:00
mark_story
fd818bc493 Applying patch from 'mulleto'. Fixes plugin view file location with CamelCase plugin names. Test cases added.
Fixes #6334

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8202 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-24 22:02:00 +00:00
mark_story
16eb51e91c Adding ControllerMergeVarsTestCase to more extensively test merging of vars in Controller::__mergeVars.
Fixing issue where components declared in AppController would get doubled settings if no components were declared in subclasses.
Fixes #6459

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8201 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-24 18:09:14 +00:00
mark_story
1ea5f94c29 Updating JavascriptHelper::escapeString to properly encode utf8 characters as per the JSON spec.
Test cases added, with comparisons to json_encode()
Fixes #6400

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8198 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-17 01:59:41 +00:00
gwoo
88e0cfa2f8 fixes #6427, default datasource not loaded when ds is specified
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8197 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-16 21:35:21 +00:00
gwoo
9caae67be1 removing delete from cache write refs #5206
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8195 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-16 20:14:50 +00:00
gwoo
9b4e08e93b fixing error in import map when cache is empty 2009-06-14 10:28:30 -07:00
gwoo
f9339e3c81 simplified App::path(). Changed App::build() to handle all paths.
tests passing.
2009-06-11 09:13:16 -07:00
jperras
d335fefbee Adding a 'client' option to EmailComponent:: for specifying the host to be used in the SMTP HELO request; defaults to env('HTTP_HOST'). Fixes #6264.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8194 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-11 03:07:38 +00:00
gwoo
c3643767bf some more updates to path handling 2009-06-10 16:13:39 -07:00
gwoo
e54dbd430f fixes #6419, redirect with cached view page
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8193 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-10 17:11:17 +00:00
gwoo
24d78dd671 moving path configuration to App class 2009-06-07 15:24:10 -07:00
DarkAngelBGE
d9489b942b Removing duplicate START TRANSACTION sql execution in mysqli environment, fixes #6422
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8191 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-06 15:41:33 +00:00
mark_story
2c1b7fc24e Adding nullish value handling for date, datetime, and timestamp column types to DboPostgres. Empty string values now return instead of "". Fixes #6386
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8190 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-05 02:43:08 +00:00
DarkAngelBGE
4a076b3e5f Small return-home-early refactoring for the File class
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8189 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-04 21:29:26 +00:00
gwoo
0ea02c5a94 Merge branch 'master' into 1.3 2009-06-03 10:00:56 -07:00
mark_story
7401b0c70f Updating Session path handling to fix cases when path = ''.
Test cases added.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8186 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-03 16:22:00 +00:00
gwoo
303bc0fc89 fixing up some tests. pretty much all greens for me. 2009-06-02 17:21:15 -07:00
gwoo
5f2ee8fc44 renaming session to cake_session 2009-06-02 14:52:30 -07:00
gwoo
5a45c15d9d merging 1.3-session 2009-06-02 14:52:14 -07:00
gwoo
6f21c18366 Merge branch '1.3-lib_renames' into 1.3 2009-06-02 10:17:02 -07:00
gwoo
fdd63d4e8e Merge branch 'master' into 1.3 2009-06-02 10:12:14 -07:00
jperras
d2b4995e43 Updating Model::deconstruct to handle db expressions correctly. Fixes #6372; thanks to mattcurry for the patch.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8185 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-02 03:23:15 +00:00
mark_story
a9bbae31ee Fixing primary key column length in DboSqlite. UUID primary keys now return defined length.
Test cases added for describe()
Fixes #6412

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8184 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-02 03:03:51 +00:00
gwoo
2842fe7021 fixes #6401, Session path on IIS
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8183 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-01 16:52:05 +00:00
mark_story
9aa64ef564 Ensuring that 'ext' param added by RequestHandler does not end up as a queryString parameter in Auth.redirect.
Adding test case.
Fixes #6211

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8182 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-01 00:01:58 +00:00
mark_story
f498ba0a87 Adding german error string to dbo_mssql::lastError() Fixes #6352
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8180 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-29 02:59:30 +00:00
mark_story
f0752feeec Adding patch from 'burzum'. Fixes ambiguous field sql error when joining two trees with a defined scope.
Test cases and fixtures added.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8178 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-26 17:17:57 +00:00
mark_story
1910e5482b Updating doc block for HtmlHelper::css(). Fixes #6059
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8175 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-22 01:25:13 +00:00
mark_story
41f32d8cee Updating doc block for Model::beforeDelete(). Fixes #6219
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8174 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-22 01:20:47 +00:00
jperras
4f2d65943f Fixing form helper checkbox hidden input generation for disabled fields. Thanks to 'trevorsg' for the patch & test case.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8173 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-14 03:26:53 +00:00
mark_story
8c243ee731 Applying patch from 'mete0r', adding tests for Scaffold variable setting. Fixes #6361
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8172 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-13 01:00:38 +00:00
mark_story
8b24d976f2 Placing uninflected check before irregular rules. Refs [8169] and #6351
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8170 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-08 13:25:19 +00:00
mark_story
109bda97b8 Correcting order of inflection rules in pluralize(). Places uninflected rules before irregular rules. Fixes compatibility with non-english languages. Fixes #6351
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8169 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-08 03:17:26 +00:00
jperras
2e2aa0cd3a Cleaning up HttpSocket public/protected api; all protected methods are now prefixed with an underscore. Refactored associated tests. 2009-05-07 14:49:21 -04:00
mark_story
bf7e257e02 Updating coding standards in bake templates and scaffolds. Fixes #6346
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8167 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-07 00:53:44 +00:00
gwoo
d2667c0e6f merging master into 1.3 2009-05-04 16:06:08 -07:00
gwoo
6535e6225c merging 1.2 2009-05-04 15:57:10 -07:00
nate
8369a8f2d8 Sanitizing path in Dispatcher::baseUrl(), fixes #6336, misc. whitespace fixes.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8165 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-04 20:36:22 +00:00
gwoo
be7ade3a4c Support for non-valid cookie values, fixes #6327
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8164 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-04 20:13:10 +00:00
the_undefined
94c01ac7b4 Support for non-valid cookie values, fixes #6327 2009-05-04 21:53:39 +02:00
gwoo
15518b8c9a merging 1.3-misc into master 2009-05-01 14:05:46 -07:00
gwoo
d4003c17c4 Merge branch '1.3' into 1.3-inflector 2009-05-01 11:09:34 -07:00
gwoo
54a3118d34 adding tests for map param on Inflector::slug. cleaning up. 2009-05-01 10:34:19 -07:00
gwoo
67d45cb28b updating headers on inflector and adding map param to slug(). added more comments to app/config/bootstrap.php 2009-05-01 10:03:30 -07:00
gwoo
db71202aac Merge branch '1.2' into 1.3 2009-05-01 08:26:02 -07:00
renan.saddam
975ddaa4be Fixes #6135: Primary Key detection and load record fixtures on mssql. Tests added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8161 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-29 16:26:03 +00:00
mark_story
7eaf331213 Updating doc block for FormHelper::input(). Fixes #6328
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8160 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-29 12:40:15 +00:00
nate
9f15226e46 Fixes #6318: Incorrect whitespace handling/parsing of XML documents
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8158 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-28 13:23:37 +00:00
mark_story
c8cf1a2c5b Updating __mergeVars to correctly merge parent and child component configurations.
Applied patch from 'neilcrookes'. 
Test case added. Fixes #6325

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8157 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-28 01:32:20 +00:00
mark_story
5bdd5560b7 Merge branch '1.3-jshelper' of git@thechaw.com:cakephp into 1.3-jshelper
Conflicts:
	cake/libs/view/helpers/jquery_engine.php
	cake/libs/view/helpers/js.php
2009-04-26 23:28:05 -04:00
mark_story
912f6589d5 Partial Revert "Adding optional param to remove colon on methods. Allows use inside"
This reverts commit b29e130606176e4ad4d834fdf42746b3c4085686.
2009-04-26 23:24:39 -04:00
mark_story
e990c5ba37 Adding optional param to remove colon on methods. Allows use inside
object literals.
2009-04-26 22:53:26 -04:00
mark_story
b68c78fc0f Fixing lost querystring params when user request without a session is performed. Test case updated. Fixes #6211
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8156 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-25 02:16:05 +00:00
jperras
8bb11e49d7 Fixing counterCache behavior when updating an existing record's counterScope value. Thanks for the patch, mattcurry. Fixes #6270.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8155 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-25 01:17:21 +00:00
gwoo
9ab6339392 fixes #6240, DboOracle: fix cache sources and php version compatibility
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8154 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-25 01:06:46 +00:00
jperras
97abf84770 EmailComponent:: now is set to null after calling EmailComponent::reset(). Test cases added; fixes #6314.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8153 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-25 00:01:57 +00:00
jperras
650d1e7c78 Removing hard coded HELO hostname of 'cake' in EmailComponent; better compliance with RFC-821 3.5. Test cases added. Fixes #6264.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8152 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-24 18:20:51 +00:00
mark_story
9754926d02 Merging with self. 2009-04-24 13:44:52 -04:00
mark_story
005cc1b338 Removing old JsHelperObject 2009-04-23 22:58:42 -07:00
gwoo
fd0c39fcc6 fixes #6293, Deleting non-existing record causes save() to fail. Thanks to msadouni for the patch and test!
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8150 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-22 16:47:34 +00:00
gwoo
0cc3d5149f fixes #6277, relaxing character length comparison for UUID
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8149 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-22 16:05:13 +00:00
mark_story
91edcacec2 Adding newlines between methods. 2009-04-21 09:31:52 -07:00