mark_story
|
0f2d59d987
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Network/CakeResponse.php
lib/Cake/TestSuite/CakeTestCase.php
|
2013-08-18 23:10:08 -04:00 |
|
mark_story
|
675f828e16
|
Remove insertQuery and deleteQuery.
These properties were never implemented and are misleading when people
try to use them.
Closes #3997
|
2013-08-18 21:37:37 -04:00 |
|
mark_story
|
3244b9e3d7
|
Merge branch 'master' into 2.4
|
2013-08-16 14:47:01 -04:00 |
|
euromark
|
6cf147e8c8
|
unify null checks - avoid method call in favor of strict check
|
2013-08-16 20:12:49 +02:00 |
|
dmromanov
|
7989bad5b7
|
Corrected codestyle
|
2013-08-16 14:12:27 +04:00 |
|
dmromanov
|
56ef44f495
|
Excluded method names from several tanslation strings
Removed unnecessary sprintfs
|
2013-08-16 13:42:28 +04:00 |
|
dmromanov
|
aa7c912c15
|
Removed concatenations in gettext $msg param. Closes #3986.
|
2013-08-15 03:15:35 +04:00 |
|
mark_story
|
3bdcf7b440
|
Use inner join instead of a left join.
In some database servers an INNER join performs better than a LEFT join.
Fixes #3979
|
2013-08-13 13:40:59 -04:00 |
|
k-halaburda
|
0c1dbded67
|
Added some test for related model afterFind callback
|
2013-08-13 10:19:48 +02:00 |
|
k-halaburda
|
bb13af683b
|
Added some test for related model afterFind callback
|
2013-08-13 10:19:20 +02:00 |
|
mark_story
|
26769edd04
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Utility/CakeTime.php
lib/Cake/VERSION.txt
|
2013-08-12 14:39:02 -04:00 |
|
mark_story
|
6ce10b28c9
|
Update doc blocks.
|
2013-08-12 14:37:43 -04:00 |
|
euromark
|
f3018cc532
|
refactor methods to avoid else block on returning early
|
2013-08-12 19:06:34 +02:00 |
|
euromark
|
b09dc7213a
|
deprecate Controller::flash() and adjust some other deprecation messages.
|
2013-08-12 12:51:12 +02:00 |
|
Jose Lorenzo Rodriguez
|
9d07fc4330
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Console/ShellDispatcher.php
lib/Cake/Utility/CakeNumber.php
lib/Cake/View/Elements/sql_dump.ctp
|
2013-08-11 23:31:10 +02:00 |
|
k-halaburda
|
74eb32696a
|
Some more space / tabs issues [Travis PHPCS=1 fail]
|
2013-08-09 11:51:19 +02:00 |
|
k-halaburda
|
2655d16c13
|
Fixed tabbing in some places
|
2013-08-09 11:17:12 +02:00 |
|
k-halaburda
|
3855c0690e
|
Fixed tabing formating
|
2013-08-09 10:26:44 +02:00 |
|
k-halaburda
|
c033df3218
|
Fixed duplication of Model's afterFind callback in HABTM relation and content of array passed to that callback [ticket 3970]
|
2013-08-09 09:56:33 +02:00 |
|
euromark
|
fc2d28974b
|
remove undocumented code and uncessary in_array() checks + cleanup
|
2013-08-08 03:56:58 +02:00 |
|
mark_story
|
e36c537cf6
|
Switch from LEFT to INNER joins.
INNER joins are often more efficient as they can result in fewer rows
being examined before a result set is generated.
Fixes #3968
|
2013-08-07 12:50:02 -04:00 |
|
ADmad
|
38b050a711
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
|
2013-08-04 19:26:55 +05:30 |
|
ADmad
|
473e4f991f
|
Fixed bug when using multi model fieldList and whitelists for all models are not provided.
Fixes #3948
|
2013-08-03 02:49:41 +05:30 |
|
mark_story
|
2d2721d2d9
|
Update docs for MySQL
MySQL supports a few non-standard options. Document them.
|
2013-07-19 23:01:16 -04:00 |
|
Mike Scarborough
|
c780ded512
|
add SSL support to MySQL PDO connections
|
2013-07-19 22:56:51 -04:00 |
|
euromark
|
7a1a3e593d
|
Always create user agent hash in session
|
2013-07-18 12:02:42 +02:00 |
|
mark_story
|
e03d3df0fe
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Test/Case/View/HelperTest.php
lib/Cake/VERSION.txt
|
2013-07-17 22:40:09 -04:00 |
|
Phally
|
1fe424a62b
|
Moves code out of the try/catch blocks in the connect() methods.
That code wouldn't throw a PDOException, so having it in the
try/catch block is pointless. Moving it out makes it easier to
read.
|
2013-07-15 12:59:46 +02:00 |
|
ADmad
|
d161b21ae1
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
|
2013-07-14 10:58:55 +05:30 |
|
euromark
|
a643295e4c
|
remove @access and unnecessary $name
|
2013-07-08 15:50:50 +02:00 |
|
ADmad
|
4ded269549
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
lib/Cake/VERSION.txt
|
2013-07-07 12:22:12 +05:30 |
|
euromark
|
af455b4121
|
correct return types in doc blocks
|
2013-07-05 17:19:22 +02:00 |
|
euromark
|
e7f380d2b7
|
doublespace to single space
|
2013-07-05 14:36:40 +02:00 |
|
euromark
|
c989624f80
|
whitespace coding standards
|
2013-07-05 14:15:18 +02:00 |
|
mark_story
|
c597855fe4
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Test/Case/Network/CakeRequestTest.php
|
2013-07-03 14:21:09 -04:00 |
|
euromark
|
f389435bae
|
coding standards and else block simplification
|
2013-07-03 19:27:17 +02:00 |
|
euromark
|
a90cb29c0f
|
simplify else cases
|
2013-07-03 01:14:41 +02:00 |
|
euromark
|
7cb19b97db
|
coding standards and simplification of else cases as well as some minor fixes
|
2013-07-03 00:52:48 +02:00 |
|
Jose Lorenzo Rodriguez
|
58149f2315
|
Backporting from 2.4 fix for booleans in mysql when running PHP 5.5
|
2013-07-02 16:51:29 -04:30 |
|
Marc Würth
|
ff1f80349a
|
Removed superfluous break
In every case of the if clause it will return, so break is not needed.
|
2013-07-02 21:00:24 +02:00 |
|
mark_story
|
f09693f6e8
|
Merge branch 'master' into 2.4
|
2013-06-29 23:26:26 -04:00 |
|
Marc Würth
|
aabeaada0f
|
Fixed @return statement in DboSource::disconnect
|
2013-06-27 17:38:46 +02:00 |
|
Marc Würth
|
070a6f0ad5
|
Added a related cookbook link to DataSource.php
|
2013-06-26 22:07:52 +02:00 |
|
Jose Lorenzo Rodriguez
|
489d1db7d1
|
More edge case handlignfor native_type in mysql for older versions of
php
|
2013-06-24 14:15:15 +02:00 |
|
Jose Lorenzo Rodriguez
|
b8bbf0b4a9
|
Preventing notice in older versions of php
|
2013-06-24 14:03:50 +02:00 |
|
Jose Lorenzo Rodriguez
|
f6eac9a175
|
Fixing boolean type introspection for Mysql in PHP 5.5
|
2013-06-24 13:42:29 +02:00 |
|
mark_story
|
dcf7df39d2
|
Merge branch 'master' into 2.4
|
2013-06-21 17:47:37 -04:00 |
|
euromark
|
1b1943954b
|
CakeSession improvements
|
2013-06-18 23:49:42 +02:00 |
|
ADmad
|
12da3b1f27
|
Merge branch 'master' into 2.4
|
2013-06-16 13:07:44 +05:30 |
|
Mark Story
|
b2a40c787d
|
Merge pull request #1327 from pafuinlu/patch-2
Added a clear() function to Model.php (2.4 branch)
|
2013-06-14 06:18:37 -07:00 |
|