Mark Story
37d235fa16
Merge pull request #594 from tigrang/auth-ext
...
Added `contain` option to AuthComponent's Authentication objects
2012-05-09 17:48:44 -07:00
Mark Story
a4bbfc0cea
Merge pull request #638 from jellehenkens/2.1-router-querystring-bugfix
...
Router::queryString() order inconsistency and bug with appending to a string instead of array
2012-05-09 17:11:19 -07:00
AD7six
39a53fe0e2
updating model bake tempalte to meet code standards
2012-05-10 00:44:03 +02:00
AD7six
5b507636c7
baked controller code generates no errors
2012-05-10 00:37:51 +02:00
Jose Lorenzo Rodriguez
12ae03b876
Revert "Merge pull request #644 from nodesagency/hotfix/beforeValidate-copy-data"
...
This reverts commit 0f54758e5a
, reversing
changes made to b4a42e4a03
.
2012-05-09 17:58:08 -04:30
Jose Lorenzo Rodriguez
07bf73e88f
Revert "Merge pull request #643 from nodesagency/hotfix/beforeValidate-copy-data"
...
This reverts commit b4a42e4a03
, reversing
changes made to 6bd7da36e7
.
2012-05-09 17:57:48 -04:30
José Lorenzo Rodríguez
0f54758e5a
Merge pull request #644 from nodesagency/hotfix/beforeValidate-copy-data
...
Hotfix/before validate copy data ( Another fix for Pull request 642 )
2012-05-09 15:00:38 -07:00
Christian Winther
e8fce37a65
Fixing saveMany
2012-05-09 23:59:02 +02:00
José Lorenzo Rodríguez
b4a42e4a03
Merge pull request #643 from nodesagency/hotfix/beforeValidate-copy-data
...
Hotfix/before validate copy data ( Another fix for Pull request 642 )
2012-05-09 14:40:46 -07:00
AD7six
8060dd57d3
don't dump indexes all on the same line
2012-05-09 23:38:30 +02:00
AD7six
3a5e00fa53
var_export dumps null as NULL
...
correct for that so code standards are met with the results
2012-05-09 23:38:30 +02:00
AD7six
5ef2a0100b
code standard fix
...
the baked test must have a blank line inbetwen the last function and the
end of the class
2012-05-09 23:38:29 +02:00
AD7six
0c4613fdd2
prevent NULL in fixture files
2012-05-09 23:38:29 +02:00
AD7six
d1f522e53a
attempt to get baked code output closer to phpcs standard
2012-05-09 23:38:29 +02:00
Christian Winther
3b154fa325
Another fix for Pull request 642
2012-05-09 23:34:37 +02:00
Jelle Henkens
07735069fa
Adding support for a trailing & or & in the existing queryString
2012-05-09 22:32:57 +01:00
José Lorenzo Rodríguez
6bd7da36e7
Merge pull request #642 from nodesagency/hotfix/beforeValidate-copy-data
...
Copy changes made to $this->data in beforeValidate callbacks
2012-05-09 14:02:11 -07:00
Christian Winther
45a86a8b20
Copy changes made to $this->data in beforeValidate callbacks back to saveAssociated data variable
...
This allow changes in beforeValidate to be saved
2012-05-09 22:57:21 +02:00
Mark Story
9001844396
Merge pull request #639 from suzuki/2.2-fix-smtp-transparency
...
Fix SMTP Transparency
2012-05-08 18:03:21 -07:00
Norio Suzuki
05bcc4fe58
Delete a space between ! and empty
2012-05-09 00:16:17 +09:00
mark_story
597913aa5b
Fix test cases with postgres.
...
Setting id values confuses postgres' sequences.
2012-05-07 22:10:17 -04:00
mark_story
fbba3621b5
Fix additional issues with saveAll().
...
Fixes #2857
2012-05-07 21:36:28 -04:00
Norio Suzuki
db20600d02
Fix SMTP Transparency (RFC5321 4.5.2. first line period)
2012-05-07 22:34:14 +00:00
Jelle Henkens
45a96ae588
Fixing order inconsistency in queryString and bug with string based existing querystring
2012-05-07 21:48:58 +01:00
Ceeram
fe0c7d348a
add strict parameter to inList() and multiple()
2012-05-07 16:29:13 +02:00
mark_story
a1e06b9c8b
Fix error in Sqlite tests.
2012-05-06 23:39:02 -04:00
mark_story
6c5255ac73
Fix saving translate records with saveAll()
...
Also fixes issues saving translated data with validation
disabled. By enabling data backup in beforeSave() and beforeValidate()
the existing behavior is preserved, and the current issue is fixed.
Fixes #2857
2012-05-06 22:48:15 -04:00
Mark Story
388053cba7
Merge pull request #637 from kimegede/feature/doc-link-error
...
Changed some of the doc-block links.
2012-05-05 17:20:44 -07:00
Kim Egede Jakobsen
d180f6c3e5
Changed some of the doc-block links.
...
!But think there is a mistake somewhere with the links!
Camel-case or lowercase?
doc block content -> working link
(Model.php)
\#useTable -> \#usetable
\#displayField -> \#displayfield
\#cacheQueries -> \#cachequeries
\#sortByKey -> \#sortByKey (equals - basic.php)
2012-05-06 01:44:27 +02:00
mark_story
7416c530a2
Fix missing view variables.
...
When rendering a exception caught when rendering
an exception, some view variables were missing causing fatal
errors.
Fixes #2843
2012-05-05 13:30:18 -04:00
mark_story
efe836480b
Fix error when rendering fatal error page.
...
If you included parse errors in AppController, the fatal error
page would not correctly display.
2012-05-05 12:54:41 -04:00
Mark Story
17a00eb2e9
Merge pull request #633 from Phally/2.1
...
Redirect check is breaking AuthComponent redirect status codes
2012-05-05 08:15:00 -07:00
Phally
985d6809f1
Removed triple nested condition.
2012-05-05 17:09:43 +02:00
Jose Lorenzo Rodriguez
68823daaef
Merge remote-tracking branch 'http/2.1' into 2.1
2012-05-04 19:28:03 -04:30
Jose Lorenzo Rodriguez
6f9b26fe58
Again using same serialization strategy for cached view files, as in some environments file is corrupted
2012-05-04 19:27:08 -04:30
AD7six
ef9c5bc004
ClassRegistry::getDataSource doesn't exist
2012-05-04 20:15:04 +02:00
Frank de Graaf
7bb56e7fc3
Fixed HTTP status codes for non-redirects which were breaking AuthComponent.
2012-05-04 16:58:51 +02:00
mark_story
ed1a64ca04
Use correct argument order.
2012-05-04 08:16:43 -04:00
mark_story
7b5e45b965
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Model/Datasource/DataSource.php
lib/Cake/VERSION.txt
2012-05-03 21:06:35 -04:00
mark_story
4ab6d37abb
Update assertions.
...
Use assertXmlStringEqualsXmlString() it gives
better error reporting. Also update string concat
into heredocs.
2012-05-03 21:00:52 -04:00
mark_story
73b0345ff4
Fix issue with non-sequential array keys.
...
Xml::fromArray() should not cause errors with non-sequential
numeric array keys.
Fixes #2580
2012-05-03 20:35:01 -04:00
Ceeram
3a18384929
fix failing testcase
2012-05-03 10:13:18 +02:00
mark_story
1b288b74d9
Merge branch '2.2-configure' into 2.2
2012-05-02 21:21:43 -04:00
mark_story
b57489f3f1
Remove duplicate template.
...
Also remove double creating the home.ctp file.
Fixes #2842
2012-05-02 20:54:50 -04:00
ADmad
49f8e73ab3
Allow bulk storing/updating of mime types. Closes #2844
2012-05-03 01:39:12 +05:30
mark_story
e18200ad87
Fix assertion.
2012-05-01 21:45:06 -04:00
mark_story
e7153b5333
Add more tests
...
Fix an issue in IniReader and add tests
to ensure that dumped files can be re-read.
2012-05-01 21:43:01 -04:00
mark_story
7c4b7a2cbe
Fix mistake in path.
...
Remove incorrectly added file.
2012-05-01 21:06:24 -04:00
mark_story
d43e0aa0db
Update dump() to allow partial dumps.
2012-05-01 21:00:42 -04:00
mark_story
6ba923d20f
Make the configure adapters responsible for persistence.
...
Each adapter should be handling persistence. This allows
different adapters to handle saving config files in different ways
or places.
2012-05-01 21:00:41 -04:00