James Tancock
e173c29d33
Fix for phpcs
2015-02-04 15:31:50 +00:00
James Tancock
b8b6b67abd
Tests for ported Flash component & helper
2015-02-04 15:05:40 +00:00
James Tancock
2ff6bdccec
Back port of Flash component & helper
2015-02-04 12:18:31 +00:00
Mark Story
26bb3a549f
Merge pull request #5806 from ADmad/2.7-tree-getlevel
...
2.7 - Add method to get depth of tree's node.
2015-02-02 19:32:59 -05:00
ADmad
54fe7ed204
Add method to get depth of tree's node.
...
Backported from 3.0.
2015-02-01 17:27:46 +05:30
Mark Story
7866605c71
Merge pull request #5773 from cakephp/2.7-session
...
Session issue in 2.7
2015-01-28 21:18:20 -05:00
Mark Scherer
611889235a
Fix clear(). Add test cases.
2015-01-28 23:54:32 +01:00
Mark Story
35e0dc2bbd
Merge pull request #5760 from cakephp/master
...
Merge master into 2.7
2015-01-27 20:48:15 -05:00
Mark Story
820d572139
Merge pull request #5759 from tgskiv/patch-1
...
Let IDE work better with ClassRegistry::init()
2015-01-27 15:11:35 -05:00
tgskiv
97c6850005
Let IDE work better with ClassRegistry::init()
...
This small change will allow some IDEs like NetBeans to work with returned object like with a instance of $class parameter.
I`m sure, this will help Cake users a lot!
2015-01-27 19:06:46 +02:00
Mark Story
b5cbe4de58
Merge pull request #5744 from cakephp/master-hotfix-testing
...
Fix ControllerTestCase redirect assert by always using 302 for redirect()
2015-01-26 20:27:36 -05:00
Mark Scherer
4fa5dd62c5
Remove conditional status setting.
2015-01-26 23:47:20 +01:00
Mark Story
53f52cef3c
Merge pull request #5743 from cakephp/issue-4901
...
Fix warnings when php://output is used with ConsoleOutput.
2015-01-26 17:44:22 -05:00
Mark Scherer
70276b7a7a
Doc block adjustment.
2015-01-26 10:35:02 +01:00
Mark Scherer
e753fbadca
Fix ControllerTestCase redirect
2015-01-26 10:31:04 +01:00
Mark Scherer
76f7754014
Adding a status code test.
2015-01-26 10:29:52 +01:00
mark_story
a8ae12a700
Fix warnings when php://output is used with ConsoleOutput.
...
The php://output stream is not compatible with posix functions.
Refs #4901
2015-01-25 22:24:24 -05:00
Mark Story
4113eb0db4
Merge pull request #5717 from cakephp/2.7-session-concurrency
...
2.7 session concurrency
2015-01-23 13:16:49 -05:00
AD7six
f9ba950ad4
Skip Sqlite
...
Sqlite will accept an insert with duplicate primary keys and silently
drop the query. There is no exception, or indication that the insert
failed.
2015-01-23 08:47:05 +00:00
AD7six
5e89e893f2
Ignore counter cache also
2015-01-23 08:30:34 +00:00
AD7six
c0ee49fe88
Remove callbacks to speed up saving
2015-01-23 08:30:26 +00:00
AD7six
838d23300b
Remove some exists checks by not validating
2015-01-23 08:29:59 +00:00
AD7six
51bd1d0a2b
If a PDOException is thrown, try again.
...
This can occur if the exists check returns no rows, but before this
request inserts into the database a _different_ thread inserts a
session record.
2015-01-23 08:28:08 +00:00
AD7six
e86365ca0f
Add a failing test for session concurrency problems
2015-01-22 23:04:34 +00:00
mark_story
4e33ef0386
Merge branch 'issue-5712' into master.
2015-01-21 23:32:25 -05:00
mark_story
58334996a2
Fix PHPCS errors.
2015-01-21 23:32:08 -05:00
Mark Story
49a08dc259
Merge pull request #5709 from cakephp-fr/2.x-pot-files
...
put message in cake.pot file instead of default.pot
2015-01-21 23:24:41 -05:00
Mark Story
2b89f6eb4f
Merge pull request #5707 from richan-fongdasen/richan-fongdasen
...
Add mobile agent for Blackberry Z10 and Blackberry Z30, fixes #5706
2015-01-21 23:24:17 -05:00
Ceeram
9ce75e6fd6
No need to get the datasource if column is defined in schema. Fixes #5712
2015-01-22 00:46:55 +01:00
Richan Fongdasen
fd47d26f6b
Keep the user agent list in alphabetical order
2015-01-21 22:50:46 +07:00
cake17
2c251b80af
put message in cake.pot file instead of default.pot
2015-01-21 16:41:34 +01:00
Richan Fongdasen
a7d604bca8
Add mobile agent for Blackberry Z10 and Blackberry Z30, fixes #5706
2015-01-21 13:47:03 +07:00
Mark Story
3cc3db8380
Merge pull request #5681 from robertpustulka/2.7-short-plugin-shell
...
2.7 - Short plugin alias in shells
2015-01-19 21:44:47 -05:00
mark_story
511ee1f776
Fix strict error with 2.6 code.
2015-01-19 21:43:14 -05:00
Robert
c755d9b5e5
Updated comments
2015-01-19 08:55:40 +01:00
Robert
db1442573d
Fix failing tests
2015-01-19 08:51:57 +01:00
Robert
f4933b29a8
CS fix
2015-01-19 08:51:57 +01:00
Robert
dedb2e4191
Added short plugin alias in shells
2015-01-19 08:51:57 +01:00
mark_story
3078a1eb52
Merge branch 'master' into 2.7
...
Conflicts:
lib/Cake/VERSION.txt
2015-01-16 22:22:26 -05:00
Mark Story
c5c9c3ac42
Merge pull request #5680 from cakephp/master-fix-notice
...
Fix notice in PaginatorHelper when model params are not available.
2015-01-16 13:05:33 -05:00
Mark Scherer
d37721ab0e
Fix notice in PaginatorHelper when model params are not available.
2015-01-16 14:11:32 +01:00
mark_story
8a91878033
We can't depend on PHPUnit anymore as it doesn't exist in pear form
2015-01-15 21:59:23 -05:00
mark_story
09e5e43d09
Update version number to 2.6.1
2015-01-15 21:36:35 -05:00
Mark Story
2a9f2d4b58
Merge pull request #5668 from cakephp/issue-5649
...
Fix numeric values not being quoted for MySQL set columns.
2015-01-15 21:29:57 -05:00
Mark Story
8969565526
Merge pull request #5675 from cakephp/master-docs
...
Correct CakeSocket docblocks.
2015-01-15 21:27:30 -05:00
mark_story
396d501d1e
Fix / being handled incorrect by referer()
...
Backport changes in #4987 to 2.x. This solves issues with duplicate base
directories when redirecting back to '/'
Fixes #4812
2015-01-15 21:26:34 -05:00
mark_story
d4a6d3f6c0
Fix numeric values not being quoted for MySQL set columns.
...
Set columns should always have their values quoted. Not quoting values
makes MySQL do bad things.
Refs #5649
2015-01-15 21:10:33 -05:00
Mark Scherer
2b1e487530
Correct CakeSocket docblocks.
2015-01-15 23:39:09 +01:00
Mark Story
ac5ba9942b
Merge pull request #5670 from davidsteinsland/fix_session_destroy
...
CakeSession::destroy() should check for existence of session
2015-01-15 08:13:39 -05:00
David Steinsland
687d0b44f5
Backport of https://github.com/cakephp/cakephp/issues/5667
2015-01-15 11:00:27 +01:00
