Jose Lorenzo Rodriguez
8b7f069415
Wrapping highlight_string into a helper function as hphp does not implemnet this function
2012-01-07 19:10:44 -04:30
Jose Lorenzo Rodriguez
44dd25010d
Adding a replacement for zend_thread_id() to use within hiphop
2012-01-07 18:41:16 -04:30
Jose Lorenzo Rodriguez
67d18b0c59
Making sure the Validation class exists before checking methods on it
2012-01-07 18:33:24 -04:30
Jose Lorenzo Rodriguez
7b586369e0
Initializing CakeSession class only when required, mixing procedural code with class definitions is not good
2012-01-07 18:31:50 -04:30
Jose Lorenzo Rodriguez
399c293b77
Extracting the CakeSessionHandlerInterface into its own file
2012-01-07 18:20:16 -04:30
Jose Lorenzo Rodriguez
e5c312f4b5
Using an explicit fetch mode in all calls to PDOStatement::fetch, this also reduces the memory usage
2012-01-07 18:06:02 -04:30
Jose Lorenzo Rodriguez
fa99b58622
Ensuring the javascript provider class is loaded before checking method on it
2012-01-07 18:03:22 -04:30
mark_story
beced84d2d
Fix illegal offset caused by TranslateBehavior.
...
If you load TranslateBehavior at runtime in a disabled state, the enabled
flag would be interpreted as an association and cause errors.
Fixes #2443
2012-01-07 11:58:35 -05:00
mark_story
87924414fc
Update Configure::load() to use Set::merge()
...
This fixes some of the awkward behavior that using
array_merge_recursive() could create.
Fixes #2441
2012-01-07 10:45:48 -05:00
Jose Lorenzo Rodriguez
1991430584
Removing test that does not relate anymore to SqlServer datasource
2012-01-07 02:17:27 -04:30
Jose Lorenzo Rodriguez
0c6271dd5d
Fixing a few SqlServer failing tests
2012-01-07 02:14:07 -04:30
Jose Lorenzo Rodriguez
abb370fe3f
Fixing windows failing test case on the debug function
2012-01-07 01:39:40 -04:30
Jose Lorenzo Rodriguez
ba097d404f
Explicitly using a fetch mode in SQLServer, not doing it causes serious memory leaks
2012-01-07 01:04:02 -04:30
Jose Lorenzo Rodriguez
cd562f52ba
Fixing a couple failing tests on windows using sqlserver
2012-01-07 00:37:50 -04:30
mark_story
de7921a5d4
Merge branch '2.0' into 2.1
2012-01-06 23:06:37 -05:00
mark_story
9a7e69df7f
Add missing else for non SQLServer db's.
2012-01-06 23:06:12 -05:00
mark_story
15c7493e39
Merge branch '2.0' into 2.1
2012-01-06 23:02:16 -05:00
mark_story
f23226b937
Fix failing test on windows
...
File permissions do not work the same on windows, skip the test.
2012-01-06 23:01:59 -05:00
mark_story
d69c3f3db6
Fix failing tests with SQLServer.
2012-01-06 22:53:39 -05:00
mark_story
f22c80e9ec
Add skip for test that fails on SQLServer.
...
SQLServer doesn't support LIMIT, skip the test as its tested
in Jenkins all the time.
2012-01-06 22:21:54 -05:00
mark_story
e649a0516e
Fix singularization of 'foes'
...
Fixes #2424
2012-01-05 21:22:40 -05:00
Jose Lorenzo Rodriguez
7c0297a92c
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-05 19:58:15 -04:30
Jose Lorenzo Rodriguez
00a0c60733
Removing 1.3 Backwards compatible code to load underscored files. Now you can App::build('Locale') instead of 'locales'
2012-01-05 19:56:01 -04:30
Renan Gonçalves aka renan.saddam
5690d423c8
Merge pull request #396 from majna/2.1-event
...
2.1 event
2012-01-05 09:46:09 -08:00
Majna
8ad989cabe
Fix dispatching event when event key name is used.
2012-01-05 18:31:00 +01:00
Renan Gonçalves aka renan.saddam
edf37e7503
Merge pull request #395 from sime/2.0
...
schema update fails on -f flag
2012-01-05 02:05:25 -08:00
Simon Males
adc6846145
schema update fails with -f flag, although it's supported.
2012-01-05 16:54:02 +11:00
mark_story
95ec741b6c
Changing SCRIPT_NAME to PHP_SELF
...
Several shared hosts have issues with SCRIPT_NAME having an incorrect value.
Revert back to using PHP_SELF like in 1.3.
Fixes #2437
Fixes #2334
Fixes #2268
2012-01-04 21:10:29 -05:00
José Lorenzo Rodríguez
f9c8d0cbf9
Merge pull request #394 from majna/2.0-sess-doc
...
Remove unused property CakeSession::$security.
2012-01-04 16:20:24 -08:00
Majna
75b4e7d550
Remove unused property CakeSession::$security.
2012-01-04 22:09:40 +01:00
José Lorenzo Rodríguez
3589eaebcf
Merge pull request #393 from majna/2.0-sess-doc
...
Fix incorrect doc block in CakeSession.
2012-01-04 12:49:36 -08:00
Majna
ba02cf7a9a
Fix incorrect doc block in CakeSession.
2012-01-04 21:40:14 +01:00
mark_story
9562638610
Merge branch '2.0' into 2.1
2012-01-04 07:39:35 -05:00
mark_story
3e1c567f08
Remove duplicate methods.
...
Fix regression where #1345 was re-introduced.
Fixes #2434
2012-01-03 21:11:45 -05:00
mark_story
c43b099894
Fix null bytea columns.
...
Apply patch from 'opiazer' Fixes #2432
2012-01-03 20:51:56 -05:00
mark_story
101148c10f
Return 0 if there is no result.
...
The documented return is an integer. Stick to that.
Fixes #2430
2012-01-02 20:18:01 -05:00
mark_story
b4faa00703
Adding error to find(threaded).
...
When the model has no parent_id trigger a warning about the impending
failure and return an empty result.
Fixes #2341
2012-01-02 13:46:35 -05:00
Mark Story
81d7ef46c5
Merge pull request #392 from vesln/resource-map
...
Resource map
2012-01-02 05:23:30 -08:00
Veselin Todorov
3eea2e2073
Adding resourceMap accessor test
2012-01-02 13:53:32 +02:00
Veselin Todorov
8864805277
Adding resourceMap accessor
2012-01-02 13:53:21 +02:00
mark_story
997aa8a37b
I'm an idiot. Fix the parse error.
2012-01-01 21:29:13 -05:00
mark_story
83987bee17
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Network/CakeRequest.php
2012-01-01 21:15:27 -05:00
mark_story
ac408b38e3
Add Windows Phone OS to mobile browser list.
...
Fixes #2428
2012-01-01 12:57:35 -05:00
José Lorenzo Rodríguez
c90aafb1c7
Merge pull request #390 from shama/patch-app-doc-type
...
Fix types in docblocks in App class
2011-12-31 15:48:50 -08:00
Kyle Robinson Young
8b9770d34d
Fix types in docblocks in App class
2011-12-31 14:51:24 -08:00
mark_story
c3e9a931d6
Should have been association name, not field name.
2011-12-30 20:54:26 -05:00
mark_story
b5f918765e
Adding docs + exceptions for name translation.
...
Closes #2367
2011-12-30 20:39:04 -05:00
mark_story
6c902a19b3
Fix issue with rendering elements inside blocks.
...
Fixes exceptions being raised when you tried to render
elements inside blocks. Instead compare the number of open blocks.
This should not change before/after rendering a view.
2011-12-30 14:56:31 -05:00
mark_story
3478f8a627
Merge branch '2.0' into 2.1
2011-12-30 10:19:51 -05:00
Mark Story
a4e3790196
Merge pull request #387 from shama/patch-text-truncate
...
Prevent TextHelper::truncate() from breaking HTML
2011-12-30 07:15:35 -08:00