euromark
|
ce93e7c206
|
(isset($contain[0]) && $contain[0] === null) always false
|
2012-12-18 01:28:05 +01:00 |
|
ADmad
|
72d6ca636f
|
Docblock fixes
|
2012-11-29 04:36:29 +05:30 |
|
mark_story
|
27d7e2865e
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
lib/Cake/Network/CakeSocket.php
lib/Cake/Network/Http/HttpResponse.php
lib/Cake/Utility/Folder.php
lib/Cake/View/MediaView.php
lib/Cake/basics.php
|
2012-11-20 23:02:33 -05:00 |
|
ceeram
|
4611c987db
|
Merge pull request #959 from ceeram/phpcsw
Make phpcs pass
|
2012-11-19 15:10:47 -08:00 |
|
mark_story
|
a7f192c606
|
Merge branch 'master' into 2.3
|
2012-11-14 21:50:29 -05:00 |
|
Ceeram
|
e02eab05d5
|
Remove all todo from core, create tickets for them
|
2012-11-14 14:59:51 +01:00 |
|
euromark
|
b7e75a6399
|
more whitespace coding standards
|
2012-11-14 12:36:55 +01:00 |
|
euromark
|
354069d229
|
cascade false for recover
|
2012-11-13 21:12:46 +01:00 |
|
euromark
|
22f65f7cb5
|
asserting that tree behavior generates valid sql in recover
|
2012-11-13 11:18:17 +01:00 |
|
mark_story
|
60f9626838
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Test/Case/View/MediaViewTest.php
|
2012-11-02 16:52:51 -04:00 |
|
mark_story
|
1f31340a2a
|
Fix issue with Model::saveAssociated() and TranslateBehavior
When combining saveAssociated() with validate=first and
TranslateBehavior. Saving data for multiple locales was not done
correctly.
Fixes #3272
|
2012-10-31 23:13:56 -04:00 |
|
euromark
|
0f978195d6
|
coding standards regarding whitespaces
|
2012-10-27 00:46:12 +02:00 |
|
dogmatic69
|
641ba9f3e6
|
Merge branch '2.3' into type-checks
Conflicts:
lib/Cake/Error/ExceptionRenderer.php
lib/Cake/Routing/Dispatcher.php
|
2012-10-24 19:03:44 +01:00 |
|
mark_story
|
0b0b361e48
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
|
2012-10-20 20:48:11 -04:00 |
|
mark_story
|
888b1f4795
|
Fix issue with using contain() and query[contain]
When contain() and query['contain'] = array(...) were used together
the query['contain'] values where not respected.
Fixes #3287
|
2012-10-20 14:51:52 -04:00 |
|
mark_story
|
1aea9ac0c9
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Event/CakeEventManager.php
lib/Cake/VERSION.txt
lib/Cake/View/ViewBlock.php
|
2012-10-15 21:46:49 -04:00 |
|
Adam Taylor
|
4090c2e932
|
Remove trailing whitespace from comments
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
|
2012-10-15 18:19:37 -06:00 |
|
ADmad
|
5de492fb25
|
Allow saving new records with pre specified primary key value with treebehavior.
|
2012-10-11 01:03:49 +05:30 |
|
dogmatic69
|
408e619c9f
|
Merge branch '2.3' into type-checks
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Controller/Component/RequestHandlerComponent.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Utility/CakeNumber.php
|
2012-10-01 02:08:00 +01:00 |
|
mark_story
|
59e948fb1b
|
Merge branch 'master' into 2.3
|
2012-09-28 21:20:24 -04:00 |
|
mark_story
|
0fc9a2c29c
|
Update query building in TranslateBehavior.
* Reduce duplicate checks for Alias.*.
* Allow both the quoted and non quoted version of Alias.*
Fixes #3210
|
2012-09-25 21:01:19 -04:00 |
|
Jose Lorenzo Rodriguez
|
d5c9d97dc1
|
Merge remote-tracking branch 'origin/master' into 2.3
Conflicts:
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Utility/CakeTime.php
lib/Cake/Utility/ClassRegistry.php
lib/Cake/View/MediaView.php
|
2012-09-25 16:36:03 +02:00 |
|
euromark
|
213d4caa85
|
coding standards
|
2012-09-20 01:50:15 +02:00 |
|
mark_story
|
d6e2b6f83e
|
Re-format long lines.
|
2012-09-14 22:08:52 -04:00 |
|
dogmatic69
|
22a2e1b51e
|
converting $foo == / $foo == 0 to !$foo (and a few $foo === 0)
|
2012-09-14 18:42:25 +01:00 |
|
dogmatic69
|
cf8fccae96
|
converting $foo == null / $foo == false to !$foo
|
2012-09-14 18:26:30 +01:00 |
|
Kyle Robinson Young
|
bc40ac7d3f
|
Remove unused variables and code
|
2012-09-05 17:19:13 -07:00 |
|
euromark
|
e1fbfcef00
|
fix contain for find method
|
2012-08-13 08:10:51 +02:00 |
|
mark_story
|
e59555a66f
|
Merge branch 'master' into 2.3
|
2012-08-03 22:45:56 -04:00 |
|
mark_story
|
788cf52572
|
Fix saving empty values for translated fields with multiple locales
|
2012-08-03 22:40:38 -04:00 |
|
Mark Story
|
2728c6253e
|
Merge pull request #728 from boast/patch-2
TreeBehavior: Changed $Model->alias . '.' . $field to $Model->escapeField($field)
|
2012-08-01 19:41:04 -07:00 |
|
mark_story
|
d94cdc67fe
|
Merge branch 'master' into 2.3
|
2012-07-27 22:38:24 -04:00 |
|
mark_story
|
162d3bcb29
|
Fix whitespace errors.
|
2012-07-23 22:44:05 -04:00 |
|
David Thalmann
|
f926ae7637
|
Clean up string concatenations and refactored some reused strings into variables.
Refs #GH-729
Signed-off-by: mark_story <mark@mark-story.com>
|
2012-07-23 22:30:28 -04:00 |
|
mark_story
|
ed19821168
|
Merge branch 'master' into 2.3
|
2012-07-22 21:01:28 -04:00 |
|
mark_story
|
e6ef218600
|
Fix associated translations being inserted.
Due to changes introduced in [1c0b6c076a ]
associated translations would incorrectly be saved with a value of ''.
Fixes #3057
|
2012-07-22 20:59:24 -04:00 |
|
David Thalmann
|
78de6e276a
|
Removed inline method calls in curly braced string concat's.
|
2012-07-22 03:40:49 +03:00 |
|
David Thalmann
|
d9b5ec1a3a
|
Changed all string concatenations like $Model->alias . '.' . $field to the more consistent $Model->escapeField($field).
|
2012-07-21 22:07:51 +03:00 |
|
euromark
|
01f1b0dadc
|
correcting previously added app uses statements
|
2012-07-21 20:29:49 +02:00 |
|
euromark
|
4fe1ab1bf6
|
missing app uses statements
|
2012-07-21 13:34:33 +02:00 |
|
mark_story
|
3c6b50953b
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/VERSION.txt
|
2012-07-18 22:12:51 -04:00 |
|
euromark
|
3945c0e6a8
|
rtim files
|
2012-07-18 03:55:29 +02:00 |
|
mark_story
|
a63dd9ee9d
|
Fix incorrect formatting in TreeBehavior.
Fixes #3045
|
2012-07-17 21:06:41 -04:00 |
|
mark_story
|
a7c79e5da2
|
Fix warnings when deleting records that do not exist.
Fixes #3037
|
2012-07-14 15:54:07 -04:00 |
|
mark_story
|
8fc5726920
|
Remove trailing whitespace.
|
2012-07-11 21:39:32 -04:00 |
|
Thomas von Hassel
|
1c0b6c076a
|
Update afterSave to ensure created entires have all translated fields present
Without all fields being present, find() will be unable to find the
translated records.
Fixes #3009
|
2012-07-07 12:03:29 -04:00 |
|
mark_story
|
55c4ad3c1c
|
Fix coding standards errors.
Also remove count() calls in TreeBehavior.
|
2012-05-31 21:20:11 -04:00 |
|
mark_story
|
9a8ceaeba6
|
Merge branch '2.1' into 2.2
Conflicts:
lib/Cake/Test/Case/View/XmlViewTest.php
|
2012-05-30 21:20:56 -04:00 |
|
mark_story
|
0bfcd49249
|
Fix unbindTranslation not unbinding.
There were documented use cases that have never worked. Fix that.
Also rename a method so it better describes what it does.
Fixes #2913
|
2012-05-27 21:25:55 -04:00 |
|
Jelle Henkens
|
f7ce5262b7
|
Updating mixed @param documentation to seperate list of accepted types
|
2012-05-21 21:55:10 +01:00 |
|