ADmad
72d6ca636f
Docblock fixes
2012-11-29 04:36:29 +05:30
mark_story
82d20ed948
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Test/Case/View/MediaViewTest.php
2012-11-24 15:44:52 -05:00
Mark Story
780b6f01b4
Merge pull request #962 from srwebs/feature/empty-bool-operators
...
Fix: check if bool operators in find conditions are empty.
2012-11-24 10:14:22 -08:00
Sam Mousa
8ef3034482
Added the table name to the cacheKey used by DboSource::fields. #3394
2012-11-24 12:22:17 +01:00
Ceeram
eadc3a75e5
fix coding standards
2012-11-21 15:39:03 +01:00
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
Nicolas
9c7f357029
Check if bool operators in find conditions are empty.
2012-11-17 12:39:08 +01:00
Ceeram
e02eab05d5
Remove all todo from core, create tickets for them
2012-11-14 14:59:51 +01:00
Ceeram
56225bcca3
fix all warnings except TODO warnings
2012-11-14 12:56:10 +01:00
euromark
8f78b1e05b
fix coding standards for whitespaces
2012-11-14 12:24:08 +01:00
mark_story
e0aab77dab
Merge branch 'master' into 2.3
...
Conflicts:
app/Config/Schema/i18n.php
lib/Cake/I18n/Multibyte.php
lib/Cake/Test/Case/Log/CakeLogTest.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
2012-11-10 21:33:26 -05:00
ADmad
7360abb0fe
Added query logging to DboSource::insertMulti(). Closes #3354
2012-11-09 16:51:51 +05:30
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
Ceeram
093275aef6
Use correct value when using virtualFields in conditions and IN (), refs PR#897
...
Squashed commit of the following:
commit 6a986953e16601fb34a132df24ae16f882f218cf
Merge: babd714 118dd8c
Author: Ceeram <c33ram@gmail.com>
Date: Fri Nov 2 13:02:15 2012 +0100
Merge branch 'master' into virtualcondition
commit babd714d80178c68b0e3fbcc21fc53b846484fd8
Author: Ceeram <c33ram@gmail.com>
Date: Fri Nov 2 00:22:43 2012 +0100
fix incorrect tests
commit 9a46c13e1aa13905b8e5474947933676e03009ce
Author: Ceeram <c33ram@gmail.com>
Date: Thu Nov 1 11:44:19 2012 +0100
add test for regular fields and conditionKeysToString with IN
commit 3aa62e5cb93aa0c7bbb47e874fc1446873dd0d27
Merge: a8f0c3d 1f31340
Author: Ceeram <c33ram@gmail.com>
Date: Thu Nov 1 11:37:01 2012 +0100
Merge branch 'master' into virtualcondition
commit a8f0c3d918761ff2c456cc3a53f1e3ee5b1c6173
Author: Ceeram <c33ram@gmail.com>
Date: Thu Oct 11 16:46:10 2012 +0200
use correct value when using virtualFields in conditions and IN ()
2012-11-02 14:29:38 +01: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
ADmad
1763f46340
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/bootstrap.php
2012-10-23 16:53:01 +05:30
mark_story
a0a61b5980
Fix issue where createSchema() would omit primary keys sometimes.
...
Fix missing primary key SQL when using the primary flag + other indexes.
Fixes #3292
2012-10-22 20:46:10 -04:00
Jose Lorenzo Rodriguez
c00d58b4ef
Fixed problems with resetSequence() not using the correct sequence name
...
in postgres
2012-10-21 16:32:52 +02: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
mark_story
3e0fa0009b
Show the last 200 queries instead of the first 200.
...
Fixes #3273
2012-10-14 21:30:28 -04:00
ADmad
a1aa73c1a2
Cache character set names
2012-10-07 21:58: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
Jose Lorenzo Rodriguez
c870044262
Fixed typo
2012-09-25 17:05:41 +02: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
dogmatic69
cd99b7d6ff
fixing error pointed out by dereuromark with recursive https://github.com/cakephp/cakephp/pull/846#commitcomment-1884073
2012-09-21 23:40:21 +01:00
dogmatic69
36314e6d37
converting if ($foo != "") to if ($foo)
2012-09-21 23:34:37 +01:00
dogmatic69
b1f26b59a3
converting if ($foo != null) to if ($foo)
2012-09-21 23:30:43 +01:00
José Lorenzo Rodríguez
2818ec6eb4
Merge pull request #859 from dereuromark/2.3-format-delta
...
adding CakeNumber::formatDelta() and fixing issue with format()
2012-09-21 00:18:35 -07:00
Ber Clausen
aaefbf1c2f
Add MySQL FULLTEXT support.
...
Minor optimizations and testing added.
Merge pull request #862 from bar/mysql-fulltext
Fixes #262
2012-09-20 20:42:30 -04:00
mark_story
a9750264e4
Revert "Add MySQL FULLTEXT support."
...
This reverts commit 36c99a358f
.
2012-09-20 20:39:02 -04:00
Mark Story
f4a639cbfa
Merge pull request #862 from bar/mysql-fulltext
...
Add MySQL FULLTEXT support.
Fixes #262
2012-09-20 17:20:23 -07:00
Ber Clausen
36c99a358f
Add MySQL FULLTEXT support.
...
Minor optimizations and testing added.
2012-09-20 00:35:42 -03:00
euromark
213d4caa85
coding standards
2012-09-20 01:50:15 +02:00
mark_story
99cbd22969
Fix coding standards.
2012-09-18 14:52:46 -04:00
mark_story
a1838a0c85
Implement missing bits for automatic sequence resetting.
...
Refs #3206
2012-09-18 14:12:23 -04:00
mark_story
55dcb9c3b3
Implement resetSequence()
...
This is an optional method in DboSource that allows datasources to
resetSequence values in tables. This is useful for datasources like
Postgres, and makes using fixtures much easier.
Fixes #3026
2012-09-17 20:50:05 -04:00
dogmatic69
a38a616cba
changing join() to implode() for consistency
2012-09-15 11:06:02 +01:00
Mark Story
89c98233b5
Merge pull request #843 from dereuromark/2.3-ticket-3172
...
check() for CookieComponent and Configure
2012-09-14 18:22:34 -07:00
euromark
6d3e0a25b2
save some memory usage (PHP < 5.4) in case of huge content and cut off the isset call
2012-09-15 02:33:05 +02:00
dogmatic69
f5a8eb6bbf
ADmads comments
2012-09-14 19:57:51 +01:00
dogmatic69
cfadc4dbb0
strict type checks and removing some duplicate count() calls by setting a variable
2012-09-14 19:26:00 +01: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
mark_story
fb9360767e
Make connection exceptions more helpful.
...
Fixes #3204
2012-09-12 22:31:07 -04:00
Kyle Robinson Young
bc40ac7d3f
Remove unused variables and code
2012-09-05 17:19:13 -07:00
mark_story
6664acba79
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-09-05 20:15:36 -04:00
Kyle Robinson Young
200dd2dc9b
Code standards fixes, unneeded break statements
2012-09-04 11:30:52 -07:00
mark_story
3cb501f1c5
Fix issue created in [ e8b5d81fd7
]
...
Query conditions with `-` and no surrounding spaces were quoted
incorrectly.
Fixes #3178
2012-09-03 13:24:38 -04:00
mark_story
571c8bc08c
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/Task/TestTask.php
2012-09-01 13:51:40 +01:00