Commit graph

3282 commits

Author SHA1 Message Date
nate
e47b1960ad Merge branch '1.3' of dev@code.cakephp.org:cakephp into 1.3 2009-07-31 11:54:01 -04:00
nate
729d8fddea Applying PHP 5.3 compatibility patch from Mark Story. Please update your config/core.php, webroot/index.php and webroot/test.php accordingly. 2009-07-31 11:48:30 -04:00
gwoo
01d22ffd2e fixing up some App::import calls 2009-07-30 15:01:22 -07:00
gwoo
1423b0067b Merge branch '1.2' into 1.3 2009-07-30 11:34:33 -07:00
gwoo
aab4dc2f1a Merge branch '1.3-inflector' into 1.3 2009-07-29 10:32:25 -07:00
DarkAngelBGE
f710ae7fbe Minor refactorings + fix for dbo mysqli related to previous commit
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8261 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-28 20:08:24 +00:00
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
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
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
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
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
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
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
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
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