Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: cakephp/cakephp
...
head fork: cakephp/cakephp
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Oct 18, 2011
@markstory markstory Applying fix from 'euromark' to fix protocol relative links
Fixes #2107
5ee09eb
@markstory markstory Fix missing preg_quote around highlight searches.
Highlight strings should be literal values not regexp fragments.
Fixes #2111
0ac46f3
Commits on Oct 20, 2011
@johannesnagl johannesnagl Enable Asset timestamp for image submit buttons ... 76e6452
@markstory markstory Adding test for form->submit() and timestamps. 4e37c79
Commits on Oct 21, 2011
@markstory markstory Add test for using SQL constants in virtualFields.
Fixes #2085
8d9091d
Commits on Oct 22, 2011
@markstory markstory Remove getTests() that was stupid. 118cbe2
@markstory markstory Fix issue with postgres and virtualFields
If a virtualField was set to a literal value it would be quoted.
Test added.

Fixes #2085
c66fe39
@markstory markstory Fix flaky test. SimpleTest is the worst. fcc0aa4
Commits on Oct 23, 2011
@markstory markstory Fix incorrectly generated boundaries for multipart messages.
Fix issue where multipart boundaries would be a simple string.
Fixes #2144
2bdb4fe
Commits on Oct 25, 2011
@fiblan fiblan Fix missing prefix when reading table schema.
When using prefixes, table metadata would be lost.
Fixes #1522

Signed-off-by: mark_story <mark@mark-story.com>
8ff669d
@markstory markstory Fix inflectino for words ending in media.
Fixes #2149
7c96f87
Commits on Oct 26, 2011
@ADmad ADmad Prevent unneeded afterFind callback triggering on associated models. …
…Fixes #2057
adb5be6
Commits on Oct 28, 2011
@markstory markstory Fix looping issue in Component loading.
Add failure condition to test suite.

Apple -> Orange -> Banana -> Apple is now the chain
in the testsuite.

Fixes #2168
7b023bc
Commits on Oct 31, 2011
@Phally Phally Added test for the 'on' key in validation rules. 175d148
@Phally Phally Optimized the validation processes when 'on' keys aren't used. 0141dad
Commits on Nov 04, 2011
@markstory markstory Reset user defined headers in reset()
This makes $headers consistent with other properties.
Fixes #2211
e21721a
@Phally Phally Removed double loop. 0135534
@Phally Phally Merge branch '1.3' of git://github.com/cakephp/cakephp into 1.3-dbo-s…
…ource-optimization
5ec11fb
@ceeram ceeram radio input no longer sets 0 values as checked when data isset as emp…
…ty string, fixes #2209
f760b54
@lorenzo lorenzo Merge pull request #295 from Phally/1.3-dbo-source-optimization
1.3 dbo source optimization
6c92edb
Commits on Nov 05, 2011
@markstory markstory Adding forwards compatibility to CookieComponent.
This allows 1.3 and 2.0 applications to interoperate easily.
Fixes #2131
b75c414
@markstory markstory Applying patch from 'Carlos Gant'
Removes un-necessary loop when deleting records with cascade = false.
Fixes #2050
1a2d631
Commits on Nov 15, 2011
@markstory markstory Fix default CSV content-type
Excel prefers text/csv for CSV files.
Fixes #2259
b00eb08
Commits on Nov 16, 2011
@markstory markstory Fix import in Sanitize.
Its previous form caused issues with userland plugins.
Fixes #2261
2ac00f0
Commits on Nov 19, 2011
@markstory markstory Update error_reporting() level.
PHP5.4 includes E_STRICT in E_ALL error level,
CakePHP 1.3 isn't fully compatible with E_STRICT.
f71f8b5
@markstory markstory Fix issue in TimeHelper with translated values.
LC_TIME files using unicode code points would incorrectly display.
Use either the Multibyte class or mbstring to correctly detect
and convert values.

Fixes #912
b587537
Commits on Nov 25, 2011
@markstory markstory Fix issue with CacheHelper and named parameters with '
Fixes #2291
7e91d13
@markstory markstory Fix protocol relative urls for CSS and JS files.
Protocol relative urls are generally not on the same host
don't try and run them through the asset filters.

Fixes #2285
ff993f8
Commits on Nov 30, 2011
@markstory markstory Fix incorrect alias/name usage.
Fixes #2317
fc38787
@ceeram ceeram Fixing cascading delete, when using foreignKey false and setting cond…
…ition on hasOne
6b1fe87
@ceeram ceeram adding back PHP4 compatibility, accidentally removed in previous commit 29618fc
@ceeram ceeram change since version to correct number ce49fab
Commits on Dec 03, 2011
@markstory markstory Fix missing directory in dispatcher with rewrite off.
When re-writing is disabled, and the deployment directory
contains either 'app' or 'webroot' the computed path was
incorrect.

Fixes #2330
3b27092
Commits on Dec 04, 2011
@shin1x1 shin1x1 modified for PHP 5.4 and Builtin web server 9cbc301
@shin1x1 shin1x1 modified cake/console/templates/skel for Built-in web server 0a3791b
Commits on Dec 05, 2011
@markstory markstory Remove useless parameter in Set test.
Fixes #1824
8b866ac
@shama shama Fix TextHelper excerpt method to work as documented
Fixes #2339
d3e8f9f
@lorenzo lorenzo Merge pull request #351 from shin1x1/1.3
The patch for PHP5.4 and Built-in web server
ca098eb
Commits on Dec 06, 2011
@markstory markstory Merge pull request #358 from shama/1.3
Fix TextHelper excerpt method to work as documented
6836ce5
Commits on Dec 09, 2011
@ADmad ADmad Element cache filename now properly includes extra param names passed…
… along with 'cache' => true option. Fixes #2356
850a33d
Commits on Dec 17, 2011
@ADmad ADmad Adding missing Model::create() when using Model::save() in a loop. Fi…
…xing some code formatting and updating api doc blocks. Fixes #848
90bcb75
Commits on Dec 18, 2011
@ADmad ADmad Added test case for TreeBehavior::recover(). Refs #2392 482e487
Commits on Dec 28, 2011
@markstory markstory Fix a number of errors with PHP 5.4 9950af8
Commits on Dec 29, 2011
@markstory markstory Update version to 1.3.14 5ac77c2
Commits on Jan 06, 2012
@markstory markstory Fix singularization of 'foes'
Fixes #2424
049b04d
Commits on Jan 08, 2012
@markstory markstory Fix issue with find(count) and translated conditions.
Because count queries did not have joins created for the translated
fields pagination would generate invalid queries. Checking the conditions
for translated fields and adding in the correct joins solves that.
Extract what would have been duplicated code into methods.

Add a few protected properties to keep method signatures sane. The code
could be even simpler if the existing find(count) join was removed.

Fixes #2349
f9bcc95
Commits on Jan 10, 2012
@markstory markstory Adding iPad and windows phone os as mobile clients.
Fixes #2452
340a9fd
Commits on Jan 13, 2012
@markstory markstory Fix missing check for COUNT(DISTINCT in DboMSSQL
Fixes #2470
f867f0c
Commits on Jan 19, 2012
@wnasich wnasich Test case and Fix for: Number::currency() issue for custom formats an… 38eb214
Commits on Jan 20, 2012
@markstory markstory Merge pull request #426 from wnasich/1.3
Fixes ticket #2489
9a3e6bd
@markstory markstory Merge pull request #284 from Phally/1.3-validation
Validation always does a count query
27392bf
@bar bar Fix a bug introduced when generating partial compatibility between 1.3
and 2.0 Cookies, where an empty valued key caused a PHP notice. Also,
harden tests. Completes the fix for #2131.
48d3fc7
Commits on Jan 21, 2012
@markstory markstory Merge pull request #435 from bar/cookie-2.0-compatibility
Cookie 2.0 compatibility
359becc
@markstory markstory Fix header stripping.
To/Bcc/Cc need to be prefixed with new lines to be a successful
injection.  Check for that instead of other letters.

Fixes #2484
83155c0
Commits on Feb 02, 2012
@markstory markstory Fix reset() not affecting delivery.
Fixes #2533
6237111
Commits on Feb 11, 2012
@markstory markstory Make code in 1.3 the same as 2.0
Fixes #2561
52f4b08
Commits on Feb 18, 2012
@markstory markstory Fix duplicate items in HABTM associations.
Apply patch from 'Kim Biesbjerg'.  Fixes issues where nested
HABTM associations would create duplicate content.

Fixes #2564
Fixes #1598

Conflicts:

	cake/libs/model/datasources/dbo_source.php
9558943
@dkullmann dkullmann Added test for caching of SELECTS, but, not other statements which ha…
…ve the word "select" somewhere in them

Examples include:

INSERT INTO … VALUES … ('Great selection!')
DROP TABLE IF EXISTS selection_table

Signed-off-by: David Kullmann <kullmann.david@gmail.com>
47a8525
Commits on Feb 19, 2012
@markstory markstory Merge pull request #492 from dkullmann/1.3-fix-cache-regex
1.3 fix cache regex
9efeea5
Commits on Feb 22, 2012
@vantienvnn vantienvnn Fixed #2591 76cfd39
@markstory markstory Merge pull request #513 from vantienvnn/1.3
Cookie component small optimization
6beae4a
Commits on Mar 12, 2012
@hiromi2424 hiromi2424 fixed except on error triggered. c19b233
@markstory markstory Merge pull request #556 from hiromi2424/1.3-fix-error-excerpt
1.3 fix error excerpt
90fee6b
Commits on Mar 13, 2012
@jrbasso jrbasso Updated copyright to 2012. d805b3a
Commits on Mar 18, 2012
@ceeram ceeram add .travis.yml file a6c2144
Commits on Mar 25, 2012
@markstory markstory Remove bogus test.
It was failing as the method handling was wonky.
3ff1ff1
Commits on Mar 29, 2012
@markstory markstory Update version numbers to 1.3.15
Fixes #2725
593e63b
Commits on Apr 24, 2012
@markstory markstory Fix singularization of databases.
Fixes #2822
a0c9299
Commits on May 07, 2012
@markstory markstory 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

Conflicts:

	cake/libs/model/behaviors/translate.php
	cake/tests/cases/libs/model/behaviors/translate.test.php
	cake/tests/fixtures/translated_item_fixture.php
	lib/Cake/Test/Case/Model/models.php
decd8e1
Commits on May 08, 2012
@markstory markstory Fix additional issues with saveAll().
Fixes #2857

Conflicts:

	cake/libs/model/behaviors/translate.php
	cake/tests/cases/libs/model/behaviors/translate.test.php
3d8f090
Commits on Jul 11, 2012
@daschl daschl Datasource: This fixes an issue where the tables for different users …
…override each other.
061d4a2
@daschl daschl Datasources: one more change here so that the correct columns are sel…
…ected and not from the global table namespace.
fb31146
Commits on Jul 12, 2012
@lorenzo lorenzo Merge pull request #712 from daschl/oracle-listsources-fix
Oracle listsources fix
57106b1
Commits on Jul 23, 2012
@timglabisch timglabisch at first set file loaded, than load file.
i had trouble with "Cannot redeclare class DboSource". The Problem is that the file is loaded and may the included file also requires that class. In this case the __load function recalls and reload the same file because the loaded flag isnt set.


try include *\cake\libs\model\datasources\dbo_source.php
try include *\cake\libs\model\datasources\dbo_source.php
finsed include *\cake\libs\model\datasources\dbo_source.php
PHP Fatal error:  Cannot redeclare class DboSource in *\cake\libs\model\datasources\dbo_source.php
3f1edf7
@markstory markstory Merge pull request #732 from timglabisch/patch-1
Fix issues with circular dependencies.
acd25c3
Commits on Oct 20, 2012
@markstory markstory Fix issue with using contain() and query[contain]
When contain() and query['contain'] = array(...) were used together
the query['contain'] values where not respected.

Fixes #3287

Conflicts:
	cake/libs/model/behaviors/containable.php
1904b7a
Commits on Oct 31, 2012
@markstory markstory Fix cake shell script to run properly on macos.
Fixes #3323
fc012b9
Commits on Feb 16, 2013
@mathop mathop Removed the error control operator from "ocilogon" and "ociplogon" to…
… avoid "white screen" when the OCI8 extension is not enabled.
0b1c3d6
Commits on Feb 17, 2013
@markstory markstory Merge pull request #1144 from mathop/1.3-dbo_oracle
Removed the error control operator from "ocilogon" and "ociplogon".
9cb5cb0
Commits on Feb 28, 2013
@ADmad ADmad Docblock fixes to help apigen f883840
Commits on Apr 28, 2013
@lorenzo lorenzo Making sure correct alias is selected for pagination 8fc6b3f
Commits on Apr 29, 2013
@lorenzo lorenzo Updating version numbers 2eab53d
Commits on May 01, 2013
@markstory markstory Only allow sort fields that match the current object alias.
Backport 37ce6df to 1.3

Fixes #3803
f2c9639
Commits on Jun 25, 2013
@markstory markstory Fix options['order'] also being vulnerable to injection attacks. 51beab4
@markstory markstory Bump version number to 1.3.17
We missed a commit in 1.3.16 and need to make a new tag.
143d7d7
Commits on Jul 20, 2013
@mathop mathop Trigger error when dbo source is not enabled. 09c1b61
@markstory markstory Merge pull request #1444 from mathop/1.3-dbo-source
Trigger error when dbo source is not enabled.
c79f985
Commits on Dec 24, 2013
@ozzyogkush ozzyogkush Allow condition keys with : or ? chars in sequence
This was failing when attempting to cast values inside a key; ie:

`'Model.field::integer' => array(1, 2)` or
`'"Model"."field"::integer' => array(1, 2)`

where the number of `:` or `?` characters is equal to the number of elements in the value array. 

That would cause it to attempt to run the `__parseKey()` function, ending up with a condition segment string such as `... "Model"."field"::integer = ` which was not the intended behavior.

This patch looks to see if the characters are all next to each other. If so, we can safely assume that the user is not trying to interpolate the values into the key string.

Since it checks for question marks first, this also allows casted condition keys to use BETWEEN syntax, ie: `'"Model"."field"::integer BETWEEN ? and ?' => array(1, 100)`

would output the expected condition:
`"Model"."field"::integer BETWEEN '1' and '100'`
21c7506
@ozzyogkush ozzyogkush Added test case for : chars in sequence
Updated the `testParenthesisInArrayConditions()` method to include test case for commit ozzyogkush@21c7506 where condition keys can have `:` or `?` keys in sequence. Mainly for Postgresql casting types using `::` syntax where you still may want to use the `BETWEEN` syntax.
27be29b
@ozzyogkush ozzyogkush Merge pull request #1 from ozzyogkush/1.3
Added test case for : chars in sequence
fca9ee6
@ozzyogkush ozzyogkush Made better test cases for pull #2543
Better test cases for commit ozzyogkush@21c7506 - shows how to use quotes on model/field in condition key when casting to ensure proper quotes in returned condition string.
ad180e9
Commits on Dec 26, 2013
@ozzyogkush ozzyogkush removed unnecessary preg_match, spaces round . op
Removed an unnecessary `preg_match()` when checking for `?` characters in a condition key string - only needed when checking for `:` characters to ensure they're not next to each other. Added spaces around the `.` operators that I forgot to do in a previous commit.
2783c54
@ozzyogkush ozzyogkush removed comments which were wrong
Removed comments indicating known bugs, when they were not bugs.
6af0cce
@ozzyogkush ozzyogkush preg_match() strict equality
Use strict equality check when looking at return value of a `preg_match()` call.
7e0d8a5
Commits on Jan 30, 2014
@advisory-board-company advisory-board-company Set::insert data doesn't need to be an array -- comment adjusted 5eb3dc4
@markstory markstory Merge pull request #2745 from mattalexx/fix-comment
Set::insert data doesn't need to be an array -- comment adjusted
d954142
Commits on Mar 30, 2014
@ozzyogkush ozzyogkush Coding standards
Fixed a couple coding standards and strict equality flubs
d6a7852
Commits on Apr 02, 2014
@markstory markstory Merge pull request #2543 from ozzyogkush/patch-1
1.3 Allow condition keys with : or ? chars in sequence
2d4270f
Commits on Apr 26, 2014
@markstory markstory Backport f23d811 to 1.3
Use the form action URL in generated form hashes.

By including the URL in generated hash for secured forms we prevent
a class of abuse where a user uses one secured form to post into
a controller action the form was not originally intended for. These
cross action requests could potentially violate developer's mental model
of how SecurityComponent works and produce unexpected/undesirable
outcomes.

Due to the limitations of 1.3, only the *path* is used as a hash input.
This is slightly less hard than the 2.x implementation but should be
enough to prevent most forms of misuse.

Thanks to Kurita Takashi for pointing this issue out, and suggesting
a fix.
db6cfe4
Commits on Apr 29, 2014
@markstory markstory Bump version number to 1.3.18 49a3cfd
Commits on Jun 10, 2014
@markstory markstory Fix incorrect lastAction generation when named parameters are used.
Fixes #3549
82579ff
Commits on Jun 14, 2014
@markstory markstory Router in 1.x does not prevent duplicate base paths.
Since the URL going into _lastAction() has already been run through
Router::url() we can just prepend FULL_BASE_URL to it.

Refs #3549
74808f9
Commits on Jun 15, 2014
@markstory markstory Bump version number to 1.3.19 3674d70
Commits on Jul 04, 2014
@mohsen-ekhtiari mohsen-ekhtiari incorrect value for 'last' in validatio rules
As said in documentation:
"If set to true and the current rule does not validate, the current validation error message is then returned and all following rules for the current field will not be checked."
7eed83c
@markstory markstory Merge pull request #3879 from mohsen-ekhtiari/patch-1
incorrect value for 'last' in validatio rules
319fcbf
Commits on Jul 14, 2014
@markstory markstory Backport changes from cakephp/cakephp#3959 to 1.3
Backport race condition fixes from 2.x to 1.3. This is a severe enough
issue that it warrants a fix.

Refs #3857
41082b1
@markstory markstory Fix failing tests.
These tests were failing as integers were not being quoted as strings
which is expected for me at least.
1c1503f
Commits on Jul 21, 2014
@markstory markstory Bump version to 1.3.20 c246550
Commits on Aug 18, 2014
@lapenz lapenz Issue on empty param
The function returns "31/12/1969 21:00:00" when pass empty date param.
4236ed2
Commits on Aug 19, 2014
@markstory markstory Fix TimeHelper returning 1969 on invalid dates.
Instead of returning 1969, TimeHelper should return the invalid date,
and if that is missing '' should be returned.

Fixes #4294
7e78506
@markstory markstory Merge branch 'issue-4294' into 1.3 3c64a7b
Commits on Aug 23, 2014
@hmic hmic Removed all occurences of crc32 in dbo_source as a cache key,
 which is not only a stupid idea but should be actually considered a bug!
It does collide with a .1% propability for every 1.6mio queries processed
(which is not to uncommon in a shell process).
72105c2
Commits on Aug 24, 2014
@hmic hmic Removed crc32() because of *very* common collisions occuring.
Does not touch any of the exposed stuff and will not break anything
else (except you know of a collision within crc32 already and make
"use" of it - which can only be malcious.)

Has already been "fixed" in the 2.x branch.
4e6e2cd
@lorenzo lorenzo Merge pull request #4368 from hmic/1.3-dbo_source-NO-crc32
1.3 dbo source no crc32
c801347
Commits on Oct 07, 2014
@markstory markstory Fix API links.
The book has been moved, so we should update the links.

Fixes #4555
0c3b9e4
Commits on Oct 08, 2014
@lapenz lapenz Mime Type on HTML Emails
Some email readers can not interpret HTML emails without the MIME-Version set on the email header.
b9251f6
Commits on Oct 09, 2014
@lapenz lapenz Mime Type on HTML Emails Fix
Some email readers can not interpret HTML emails without the MIME-Version set on the email header.
7a00f70
@lapenz lapenz Fix for the MIME-TYPE be set by default 472c03b
Commits on Oct 11, 2014
@markstory markstory Merge pull request #4839 from lapenz/patch-3
Mime Type on HTML Emails
20ad0e1
Commits on Oct 12, 2014
@markstory markstory Fix failing tests.
Adding the MIME-Version header caused a few tests to fail.
77730bb
Commits on Nov 03, 2014
@mohsen-ekhtiari mohsen-ekhtiari Fixes #5064
Check for $params['url'] to be set before assigning
2e2a022
Commits on Nov 04, 2014
@markstory markstory Add test case for #5064
Refs #5069
8465b67
@markstory markstory Merge branch 'router-fix' into 1.3
Closes #5069
5716919