ADmad
7a9dd9af47
Merge pull request #1273 from mcreenan/master
...
Fix typo in link to cakephp book documentation
2013-05-06 09:21:45 -07:00
Matt Creenan
3c46b8a491
Fix typo in link to cakephp book documentation
2013-05-06 13:00:06 -03:00
Mark Story
64ec01b534
Merge pull request #1271 from dereuromark/2.4-sql-dump-element
...
resolve unnecessary naming conflict in SQL dump output
2013-05-06 06:03:12 -07:00
euromark
8aa0f5a8e9
adjust dbo source for sqlLogs variable
2013-05-06 14:32:47 +02:00
euromark
4c4fdc6f70
resolve unnecessary naming conflict in SQL dump output
2013-05-06 12:18:01 +02:00
ADmad
a10275fb8b
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
2013-05-05 14:36:46 +05:30
mark_story
4f179b01bd
Make note of method removal.
2013-05-04 15:03:04 -04:00
José Lorenzo Rodríguez
95dbd5308f
Merge pull request #1267 from djbobke/coding-style-fixes
...
Small coding-style fixes
2013-05-04 04:31:56 -07:00
Rik van der Heijden
dddf8aafb9
Fixed curly brackets at a few class definitions
2013-05-04 13:23:58 +02:00
José Lorenzo Rodríguez
96a769dd34
Merge pull request #1265 from ADmad/master-cakesession-valid
...
Ensure session is not invalidated after reading/deleting non-existent key.
2013-05-03 23:29:51 -07:00
ADmad
db26e24cb7
Remove error setting when reading/deleting non-existent key.
...
Fixes #3813
2013-05-04 03:16:33 +05:30
Mark Story
100a01ccc8
Merge pull request #1264 from angelxmoreno/feature/taskCollection_aliasing_ticket-3808
...
Added Aliasing of Tasks in the TaskCollection() class and added tests.
Fixes #3808
2013-05-03 14:22:46 -07:00
Angel S. Moreno
2c4e9dc8f6
Added Aliasing of Tasks in the TaskCollection() class and added tests
2013-05-03 01:53:37 -04:00
mark_story
3d682ba5e4
Update limit() in SQLServer to handle large page numbers as well.
2013-05-02 23:29:10 -04:00
mark_story
d4036310e4
Update limit() for Postgres
...
It should work like the parent class.
2013-05-02 23:27:26 -04:00
mark_story
00569ea405
Update limit() for Sqlite.
...
It should behave as the parent class does.
2013-05-02 23:25:13 -04:00
mark_story
7b0af659a9
Stop calling limit() twice on the same data.
...
DboSource::limit() now follows its documented input types, passing an
already formatted LIMIT string will result in LIMIT 0. Remove useless
array merging as well.
2013-05-02 23:12:38 -04:00
mark_story
2096d3f632
Clamp limit values to be unsigned integers.
...
This solves large page numbers potentially turning into scientific
notation when being formatted into queries. It also further safeguards
against SQL manipulation.
Refs #GH-1263
2013-05-02 22:36:50 -04:00
Rob McVey
bd3be2877d
Test case for loooong page numbers in paginated results seems to cause SQL error
2013-05-02 09:57:04 +01:00
euromark
0959c7008f
add schema param and skip interactive prompts if unnecessary
2013-05-02 00:19:46 +02:00
Mark Story
6b0ea6ac76
Merge pull request #1260 from DiegoMax/2.4
...
Patched CakeResponse's MapType() to increase performance by reducing hun...
2013-05-01 06:53:23 -07:00
mark_story
df8f5e8f84
Add additional entropy to postLink()
...
This should help make more uniq id's for postLinks that are created
sequentially.
Fixes #3807
2013-05-01 09:46:57 -04:00
Diego Massanti
255fe004eb
Patched CakeResponse's MapType() to increase performance by reducing hundreds of is_array() and is_string() system calls
2013-05-01 09:50:29 -03:00
Rachman Chavik
5682907a88
Add Cache::groupConfigs() to get group->config map
2013-05-01 12:03:15 +07:00
mark_story
41d124d4de
Fix autoLinkUrls() not autolinking URL's without a /.
...
Refs #GH-1259
2013-04-30 17:02:07 -04:00
mark_story
b41051c8ab
Also set mb_regex_encoding.
...
This fixes issues with corrupt bytes when you change the default
encoding and use regular expressions.
Fixes #3800
2013-04-30 13:00:36 -04:00
Mark Story
9b7cd0286f
Merge pull request #1257 from dereuromark/master-form-helper-hour-fix
...
fix select hours for 0/12
2013-04-30 10:00:13 -07:00
mark_story
37ce6dfc81
Only allow sort fields that match the current object alias.
...
Instead of modifying aliases that do not match, only allow aliases that
do match.
Refs #3803
2013-04-30 12:41:42 -04:00
euromark
6b015d9771
fix select hours for 0/12
2013-04-30 14:54:09 +02:00
euromark
fab5a6f4d9
spelling corrections
2013-04-30 14:11:50 +02:00
Mark
faa6292f15
Merge pull request #1255 from dereuromark/master-copyright-noise-removed
...
Remove copyright noise from test files
2013-04-30 02:24:25 -07:00
mark_story
dd8060bb12
Fix build.xml
...
Add missing hidden files. This requires an upgrade of the phing task.
2013-04-29 22:49:33 -04:00
mark_story
2b0e10eebb
Exclude domain names starting with -
...
Related to 479aefc438
Refs #3414
2013-04-29 21:31:30 -04:00
Mark Story
ac94d11e65
Merge pull request #1254 from dereuromark/master-spelling-corrections
...
spelling corrections (a url to an URL, unify URL)
2013-04-29 09:27:48 -07:00
euromark
5b298c1306
remove copyright noise from test files to unify with new newer files which don't contain it anymore anyway
2013-04-29 17:16:53 +02:00
Mark
eb9b80e63a
Merge pull request #1192 from dereuromark/master-templated-emails
...
fix line length for templated emails
2013-04-29 07:34:06 -07:00
euromark
ff0aa70b59
fix line length for templated emails
2013-04-29 16:18:00 +02:00
euromark
09d9efe235
spelling corrections (a url to an URL, unify URL)
2013-04-29 11:05:17 +02:00
Mark Story
cbce171fef
Merge pull request #1253 from zoghal/master
...
update doc of Router::redirect
2013-04-28 20:25:25 -07:00
Saleh Souzanchi
a48149b4db
update doc of Router::redirect
2013-04-29 06:06:22 +04:30
Mark Story
619f66178b
Merge pull request #1233 from spiliot/patch-1
...
Money validation should accept one decimal place.
2013-04-28 18:06:49 -07:00
spiliot
dbe90cae71
removed duplicate test case
...
```$this->assertFalse(Validation::money('text'));```
is now tested only once
2013-04-29 00:20:35 +03:00
mark_story
62186ac8da
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-04-28 17:00:30 -04:00
mark_story
e4b276c55f
Update version number to 2.3.4
2013-04-28 16:30:59 -04:00
mark_story
65b1a94e63
Simplify how fullBase is calculated.
...
Using FULL_BASE_URL fixes URL generation when URL rewriting is
disabled.
Fixes #3777
2013-04-27 23:03:25 -04:00
mark_story
c327bdc4bd
Enforce model aliases when generating order by clauses.
...
Invalid SQL could be created by sorting on an invalid alias, with
a field that exists on the model.
Fixes #3797
2013-04-27 13:29:29 -04:00
ADmad
e11d0f829a
Added html5 required attribute for select tags too
2013-04-27 18:39:53 +05:30
ADmad
8135d405a3
Merge branch 'master' into 2.4
2013-04-27 18:39:30 +05:30
Mark
372cd6f952
Merge pull request #1250 from dereuromark/master-form-input-require
...
dont add required class on wrapper div
2013-04-26 07:07:17 -07:00
Mark Story
cfda4e5c43
Merge pull request #1248 from zoghal/fix-router1
...
fix currentRoute() when $_currentRoute is empty, return false
2013-04-26 07:00:33 -07:00