Commit graph

17202 commits

Author SHA1 Message Date
Jose Lorenzo Rodriguez
a079ca3f1c Update version number to 2.3.5 2013-05-11 02:56:56 +02:00
mark_story
6017db9dc8 Add missing urlencoding to base/webroot.
This fixes URL generation when PHP_SELF or the request path contains
special characters.
2013-05-10 11:04:46 -04:00
mark_story
f745a02210 Add missing html escaping.
This should have been here the whole time. Many of these variables could
contain user input.
2013-05-09 23:12:07 -04:00
mark_story
a49c69acc4 Add missing h() calls to exception stack traces. 2013-05-09 22:23:20 -04:00
mark_story
b533c1b3ba Make named capture groups compatible with older PCRE versions.
CentOS is terrible and generally contains very old versions of PCRE.
Update patterns to use more backwards compatible named capture groups.

Fixes #3821
2013-05-09 12:18:26 -04:00
ADmad
de5b25e352 Merge pull request #1279 from cakebaker/patch-1
Split sentence into two sentences
2013-05-09 00:27:26 -07:00
Daniel Hofstetter
dae978fb3a Split sentence into two sentences 2013-05-09 10:22:43 +03:00
José Lorenzo Rodríguez
a3ad913e40 Merge pull request #1277 from real34/patch-1
Prevent autoload when checking for the existence of HttpException
2013-05-08 04:02:15 -07:00
Pierre Martin
c6d8b477fc Prevent autoload when checking for the existence of HttpException
The class_exists check has been added in 4f29f58a5e (L1R28) to prevent a side effect with a PECL extension.

However if an autoloader such as the Composer one is loaded, it will try to require this `exceptions.php` file again:
```
    'HttpException' => $vendorDir . '/pear-pear.cakephp.org/CakePHP/Cake/Error/exceptions.php',
```
this will result in a "Fatal error:  Cannot redeclare class CakeBaseException"
2013-05-08 13:25:42 +03:00
mark_story
cdede82b7e Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Core/Object.php
2013-05-07 22:22:48 -04:00
Mark Story
94ff1b20e2 Merge pull request #1276 from aymericderbois/2.3-XmlFixZeroValueProblem
Fix bug in Xml::_toArray Method
2013-05-07 19:03:18 -07:00
Mark Story
293ba4cdb9 Merge pull request #1261 from dereuromark/2.4-bake-fixtures
add schema param and skip interactive prompts if unnecessary
2013-05-07 18:59:42 -07:00
mark_story
eee37bb04e Improve docs for AclShell. 2013-05-07 21:58:57 -04:00
Derbois Aymeric
ca6612bc8b Fix a problem of tag values which is not taken into account
(when equal to zero) when passing an XML object to an array.
2013-05-08 00:56:17 +02:00
ADmad
91319bbe7b Fix disabled attribute check.
Fixes #3818
2013-05-08 01:43:27 +05:30
ADmad
372089797f Fix test 2013-05-07 23:23:07 +05:30
mark_story
06e7ba66c9 Update docs for Security::cipher()
This method is not cryptographically strong. Note that, and the
issues related to suhosin.

Related to #GH-1100
2013-05-06 23:03:20 -04:00
ADmad
43b77bc0b5 Move App::uses() calls above the class.
Improve docblock for Object::log().
2013-05-07 03:30:19 +05:30
ADmad
36a51bdad5 Avoid fail due to postgres ordering 2013-05-06 22:03:45 +05:30
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