Mark Story
f3f1e1ab52
Merge pull request #1050 from rynop/2.3
...
Fix testClear() case
2012-12-26 16:39:30 -08:00
Ryan
1881ff1664
Fix testClear() case
...
After clear of memcache config, all keys should be gone. So a read on a key should return false.
2012-12-26 16:34:23 -06:00
mark_story
9fc4678fa3
Merge branch 'zoghal-fix-tree-condidtions' into 2.3
...
Refs #GH-1049
2012-12-26 14:10:58 -05:00
Saleh Souzanchi
ed761320df
Disabled callbacks in _getMax() & _getMin()
...
This fixes issues where model/behavior callbacks append into the query
conditions without checking that its an array. Disabling callbacks
should also improve performance a tiny bit.
Refs #GH-1049
2012-12-26 14:09:45 -05:00
Mark Story
79c6cbd929
Merge pull request #1048 from dereuromark/2.3-inflection
...
cookie is not uninflected but irregular
2012-12-25 08:30:21 -08:00
euromark
500a9805b7
cookie is not uninflected but irregular
2012-12-25 00:21:12 +01:00
ADmad
367463f4c1
Added disabledTag
option.
...
Closes #3108
2012-12-24 20:48:44 +05:30
ADmad
bacfa5a977
Fix missing controller error
2012-12-24 00:29:22 +05:30
Mark Story
4aea44fbd0
Merge pull request #1035 from ceeram/2.3-pmd
...
remove unused local variables and a few improvements
2012-12-23 07:35:19 -08:00
Ceeram
3f4d24bfc0
remove unused local variables and a few improvements
2012-12-23 13:53:13 +01:00
Jose Lorenzo Rodriguez
f25f35353d
Making getMockForModel actually useful
2012-12-23 00:30:27 +01:00
Jose Lorenzo Rodriguez
bcda684ad7
Copying changes doe to cake executable to skel files
2012-12-23 00:23:01 +01:00
José Lorenzo Rodríguez
693be600f8
Merge pull request #1044 from dereuromark/2.3-doc-blocks
...
double spaces to single ones
2012-12-22 14:58:32 -08:00
euromark
b811afbc44
double spaces to single ones
2012-12-22 23:48:15 +01:00
José Lorenzo Rodríguez
a8bd7c6678
Merge pull request #961 from dereuromark/2.3-unify-object-collection
...
2.3 unify object collection
2012-12-22 14:24:26 -08:00
José Lorenzo Rodríguez
bd69979deb
Merge pull request #982 from shama/editorconfig
...
Add .editorconfig file
2012-12-22 14:21:06 -08:00
ADmad
fce07bd5b8
Fix failing test
2012-12-23 03:32:25 +05:30
José Lorenzo Rodríguez
29f6e13a28
Merge pull request #1007 from dereuromark/2.3-response-charset
...
not just json should send the charset
2012-12-22 14:00:58 -08:00
José Lorenzo Rodríguez
9f5549a7eb
Merge pull request #1037 from ADmad/2.3-formhelper
...
Added "required" attribute to input element based on validation rules fo...
2012-12-22 13:51:40 -08:00
ADmad
5aa9c26fdf
Update doctypes to html5
2012-12-23 02:57:30 +05:30
Mark Story
f61b052a51
Merge pull request #1042 from ADmad/2.3-cakenumber
...
Added support for php.ini style values
2012-12-22 13:15:38 -08:00
ADmad
a340c19c08
Added support for php.ini style values
2012-12-23 02:25:59 +05:30
Bob Fanger
13dc397172
Added unittest for REQUEST_URI with multiple FQDNs.
2012-12-21 19:59:55 +01:00
ADmad
8ef2c22c29
Added "required" attribute to input element based on validation rules for field
2012-12-21 23:20:40 +05:30
Bob Fanger
b7b6859c27
Fixes corrupted CakeRequests when a $_GET value contains "://"
2012-12-21 16:12:51 +01:00
Ceeram
5f9a371d58
phpcs violations will now fail travis builds
2012-12-21 16:06:06 +01:00
Ceeram
6672eafe53
fix whitespace errors
2012-12-21 16:05:32 +01:00
ADmad
75857b5e36
Merge pull request #1038 from ravage84/patch-1
...
Fix manual link
2012-12-21 06:10:56 -08:00
ravage84
bd71f8aa25
Update lib/Cake/Model/Model.php
...
Corrected an unlogic link from Model:find to an appropriate page in the docs
2012-12-21 15:06:43 +01:00
euromark
910e21e65e
a few more application contents should send the charset
...
adding content type tests as dataprovider
2012-12-21 12:32:32 +01:00
Mark Story
69248dfb1a
Merge pull request #1001 from dogmatic69/refactor-uuid-checks
...
Refactor uuid checks into a method
2012-12-20 17:46:07 -08:00
Mark Story
e524f7b470
Merge pull request #1036 from dereuromark/2.3-cleanup
...
code cleanup
2012-12-20 17:38:47 -08:00
mark_story
16488d0830
Merge branch 'krolow-code-review' into 2.3
...
Fixes #GH-1034
2012-12-20 20:32:07 -05:00
Vinícius Krolow
c724f0739a
Clean up code.
...
* It is not need to check the same thing twice
* One if condition instead of two ifs
* Ternary codition instead of checking if variable is null
* Returning early to avoid unnecessary conditional levels
* It is not needed to put an else as the if before already has returned
* Changing ternary conditional to PHP 5.2
* Removing some not needed conditions in the if, also changed to return false (instead of NULL) to follow the code block docs
* Changing to check before if the class_exists so we make sure that class was autoloaded before the condition
Squash of commits in https://github.com/cakephp/cakephp/pull/1034
2012-12-20 20:31:04 -05:00
euromark
2b1e5b02b5
code cleanup
2012-12-21 00:40:12 +01:00
mark_story
554d5794ce
Merge branch 'master' into 2.3
2012-12-19 21:18:52 -05:00
mark_story
08cde9f5a2
Fix foreach error when useTable = false.
...
When calling model->create() with useTable = false, an error should not
be triggered.
Fixes #3480
2012-12-19 21:18:34 -05:00
mark_story
d70730d722
Fix issues with TreeBehavior and nested deletes.
...
Fixes #3481
2012-12-19 20:48:51 -05:00
mark_story
b346227d10
Fix issues with paths + spaces.
2012-12-19 17:35:56 -05:00
ADmad
d16a9ab98e
Fix error when no model scope is set
2012-12-20 02:32:24 +05:30
ADmad
1612bdf250
Fix docblock
2012-12-20 01:54:09 +05:30
ADmad
4fe85fc3c5
Fix docblock
2012-12-20 01:22:09 +05:30
mark_story
fe2f56e8bd
Fix path resolution when app dir has been renamed.
...
This solves path resolution when the default app dir has bee
renamed, and a relative path is used to run `cake`
Fixes #3474
2012-12-18 20:31:57 -05:00
José Lorenzo Rodríguez
6af78c15df
Merge pull request #1031 from krolow/ticket-2495
...
Paginator Sort, displaying related model field more friendly
2012-12-18 00:50:12 -08:00
Mark Story
77244beaf4
Merge pull request #1033 from dereuromark/2.3-isset-null
...
Remove always false statement
2012-12-17 17:57:07 -08:00
mark_story
7ad11f59bb
Change line length in emails.
...
Use LINE_LENGTH_MUST instead of LINE_LENGTH_SHOULD. This
fixes a number of text wrapping issues caused by the narrower wrap
length.
Fixes #3151
Fixes #3473
2012-12-17 20:54:38 -05:00
euromark
ce93e7c206
(isset($contain[0]) && $contain[0] === null) always false
2012-12-18 01:28:05 +01:00
Mark
8febb71b67
Merge pull request #1003 from dereuromark/2.3-cache-prefixes
...
cache prefix for view cache to avoid collisions with domains/languages
2012-12-17 00:46:08 -08:00
mark_story
f326058a6d
Update docs for Hash::apply()
2012-12-16 23:03:43 -05:00
Vinícius Krolow
00ea427383
When you are showing a related model field in paginator sort it will display more friendly. eg: $this->Paginator->sort('Text.label') will retorn as Text Label
2012-12-17 01:55:03 -02:00