Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Patch 2 #613

Closed
wants to merge 68 commits into from

17 participants

rassar Andy Dawson Ber Clausen Mark Story José Lorenzo Rodríguez Johannes Nagl Fiblan ADmad Frank de Graaf ceeram Masashi Shinbara Kyle Robinson Young Walter Nasich David Kullmann Tien Van Vo Hiroki Shimizu Juan Basso
rassar

No description provided.

José Lorenzo Rodríguez

Yeah assertEqual(42, '43') passes. Pretty ridiculous, I'm glad we're done with SimpleTest.

markstory and others added some commits
Mark Story markstory Fix incorrectly generated boundaries for multipart messages.
Fix issue where multipart boundaries would be a simple string.
Fixes #2144
2bdb4fe
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
Mark Story markstory Fix inflectino for words ending in media.
Fixes #2149
7c96f87
ADmad ADmad Prevent unneeded afterFind callback triggering on associated models. …
…Fixes #2057
adb5be6
Mark Story 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
Frank de Graaf Phally Added test for the 'on' key in validation rules. 175d148
Frank de Graaf Phally Optimized the validation processes when 'on' keys aren't used. 0141dad
Mark Story markstory Reset user defined headers in reset()
This makes $headers consistent with other properties.
Fixes #2211
e21721a
Frank de Graaf Phally Removed double loop. 0135534
Frank de Graaf 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
José Lorenzo Rodríguez lorenzo Merge pull request #295 from Phally/1.3-dbo-source-optimization
1.3 dbo source optimization
6c92edb
Mark Story markstory Adding forwards compatibility to CookieComponent.
This allows 1.3 and 2.0 applications to interoperate easily.
Fixes #2131
b75c414
Mark Story markstory Applying patch from 'Carlos Gant'
Removes un-necessary loop when deleting records with cascade = false.
Fixes #2050
1a2d631
Mark Story markstory Fix default CSV content-type
Excel prefers text/csv for CSV files.
Fixes #2259
b00eb08
Mark Story markstory Fix import in Sanitize.
Its previous form caused issues with userland plugins.
Fixes #2261
2ac00f0
Mark Story 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
Mark Story 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
Mark Story markstory Fix issue with CacheHelper and named parameters with '
Fixes #2291
7e91d13
Mark Story 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
Mark Story 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
Mark Story 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
Masashi Shinbara shin1x1 modified for PHP 5.4 and Builtin web server 9cbc301
Masashi Shinbara shin1x1 modified cake/console/templates/skel for Built-in web server 0a3791b
Mark Story markstory Remove useless parameter in Set test.
Fixes #1824
8b866ac
Kyle Robinson Young shama Fix TextHelper excerpt method to work as documented
Fixes #2339
d3e8f9f
José Lorenzo Rodríguez lorenzo Merge pull request #351 from shin1x1/1.3
The patch for PHP5.4 and Built-in web server
ca098eb
Mark Story markstory Merge pull request #358 from shama/1.3
Fix TextHelper excerpt method to work as documented
6836ce5
ADmad ADmad Element cache filename now properly includes extra param names passed…
… along with 'cache' => true option. Fixes #2356
850a33d
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
ADmad ADmad Added test case for TreeBehavior::recover(). Refs #2392 482e487
Mark Story markstory Fix a number of errors with PHP 5.4 9950af8
Mark Story markstory Update version to 1.3.14 5ac77c2
Ber Clausen

nice to see this hits master :)

markstory and others added some commits
Mark Story markstory Fix singularization of 'foes'
Fixes #2424
049b04d
Mark Story 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
Mark Story markstory Adding iPad and windows phone os as mobile clients.
Fixes #2452
340a9fd
Mark Story markstory Fix missing check for COUNT(DISTINCT in DboMSSQL
Fixes #2470
f867f0c
Walter Nasich wnasich Test case and Fix for: Number::currency() issue for custom formats an… 38eb214
Mark Story markstory Merge pull request #426 from wnasich/1.3
Fixes ticket #2489
9a3e6bd
Mark Story markstory Merge pull request #284 from Phally/1.3-validation
Validation always does a count query
27392bf
Ber Clausen

should test for !empty($string) or $string!="" first

Ber Clausen

should return an array if $ret is null, I think

Ber Clausen

This produces a notice if the cookie value is an empty string, I think this should be tested before the first string character. And also, the function should always return an array, not a string if $ret is null. Something like this:

    function __explode($string) {
        if (!empty($string[0]) && ($string[0] === '{' || $string[0] === '[') && function_exists('json_decode')) {
            $ret = json_decode($string, true);
            return ($ret != null) ? $ret : $string;
        }
        $array = array();
        foreach (explode(',', $string) as $pair) {
            $key = explode('|', $pair);
            if (!isset($key[1])) {
                return $key[0];
            }
            $array[$key[0]] = $key[1];
        }
        return $array;
    }
bar and others added some commits
Ber Clausen 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
Mark Story markstory Merge pull request #435 from bar/cookie-2.0-compatibility
Cookie 2.0 compatibility
359becc
Mark Story 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
Mark Story markstory Fix reset() not affecting delivery.
Fixes #2533
6237111
Mark Story markstory Make code in 1.3 the same as 2.0
Fixes #2561
52f4b08
Mark Story 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
David Kullmann 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
Mark Story markstory Merge pull request #492 from dkullmann/1.3-fix-cache-regex
1.3 fix cache regex
9efeea5
Tien Van Vo vantienvnn Fixed #2591 76cfd39
Mark Story markstory Merge pull request #513 from vantienvnn/1.3
Cookie component small optimization
6beae4a
Hiroki Shimizu hiromi2424 fixed except on error triggered. c19b233
Mark Story markstory Merge pull request #556 from hiromi2424/1.3-fix-error-excerpt
1.3 fix error excerpt
90fee6b
Juan Basso jrbasso Updated copyright to 2012. d805b3a
ceeram ceeram add .travis.yml file a6c2144
Mark Story markstory Remove bogus test.
It was failing as the method handling was wonky.
3ff1ff1
Mark Story markstory Update version numbers to 1.3.15
Fixes #2725
593e63b
rassar rassar ONe other word that's irregular plural d3c000e
Andy Dawson
Collaborator

This looks like a mistake.

Please describe what a pull request is for when creating - and ensure it is agains the appropriate branch (2.2 is the only active development branch)

Andy Dawson AD7six closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 18, 2011
  1. Mark Story
  2. Mark Story

    Fix missing preg_quote around highlight searches.

    markstory authored
    Highlight strings should be literal values not regexp fragments.
    Fixes #2111
Commits on Oct 20, 2011
  1. Johannes Nagl Mark Story

    Enable Asset timestamp for image submit buttons ...

    johannesnagl authored markstory committed
  2. Mark Story
Commits on Oct 21, 2011
  1. Mark Story
Commits on Oct 22, 2011
  1. Mark Story
  2. Mark Story

    Fix issue with postgres and virtualFields

    markstory authored
    If a virtualField was set to a literal value it would be quoted.
    Test added.
    
    Fixes #2085
  3. Mark Story
Commits on Oct 23, 2011
  1. Mark Story

    Fix incorrectly generated boundaries for multipart messages.

    markstory authored
    Fix issue where multipart boundaries would be a simple string.
    Fixes #2144
Commits on Oct 25, 2011
  1. Fiblan Mark Story

    Fix missing prefix when reading table schema.

    fiblan authored markstory committed
    When using prefixes, table metadata would be lost.
    Fixes #1522
    
    Signed-off-by: mark_story <mark@mark-story.com>
  2. Mark Story
Commits on Oct 26, 2011
  1. ADmad
Commits on Oct 28, 2011
  1. Mark Story

    Fix looping issue in Component loading.

    markstory authored
    Add failure condition to test suite.
    
    Apple -> Orange -> Banana -> Apple is now the chain
    in the testsuite.
    
    Fixes #2168
Commits on Oct 31, 2011
  1. Frank de Graaf
  2. Frank de Graaf
Commits on Nov 4, 2011
  1. Mark Story

    Reset user defined headers in reset()

    markstory authored
    This makes $headers consistent with other properties.
    Fixes #2211
  2. Frank de Graaf

    Removed double loop.

    Phally authored
  3. Frank de Graaf
  4. ceeram
  5. José Lorenzo Rodríguez

    Merge pull request #295 from Phally/1.3-dbo-source-optimization

    lorenzo authored
    1.3 dbo source optimization
Commits on Nov 5, 2011
  1. Mark Story

    Adding forwards compatibility to CookieComponent.

    markstory authored
    This allows 1.3 and 2.0 applications to interoperate easily.
    Fixes #2131
  2. Mark Story

    Applying patch from 'Carlos Gant'

    markstory authored
    Removes un-necessary loop when deleting records with cascade = false.
    Fixes #2050
Commits on Nov 15, 2011
  1. Mark Story

    Fix default CSV content-type

    markstory authored
    Excel prefers text/csv for CSV files.
    Fixes #2259
Commits on Nov 16, 2011
  1. Mark Story

    Fix import in Sanitize.

    markstory authored
    Its previous form caused issues with userland plugins.
    Fixes #2261
Commits on Nov 19, 2011
  1. Mark Story

    Update error_reporting() level.

    markstory authored
    PHP5.4 includes E_STRICT in E_ALL error level,
    CakePHP 1.3 isn't fully compatible with E_STRICT.
  2. Mark Story

    Fix issue in TimeHelper with translated values.

    markstory authored
    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
Commits on Nov 25, 2011
  1. Mark Story
  2. Mark Story

    Fix protocol relative urls for CSS and JS files.

    markstory authored
    Protocol relative urls are generally not on the same host
    don't try and run them through the asset filters.
    
    Fixes #2285
Commits on Nov 30, 2011
  1. Mark Story

    Fix incorrect alias/name usage.

    markstory authored
    Fixes #2317
  2. ceeram
  3. ceeram
  4. ceeram
Commits on Dec 3, 2011
  1. Mark Story

    Fix missing directory in dispatcher with rewrite off.

    markstory authored
    When re-writing is disabled, and the deployment directory
    contains either 'app' or 'webroot' the computed path was
    incorrect.
    
    Fixes #2330
Commits on Dec 4, 2011
  1. Masashi Shinbara
  2. Masashi Shinbara
Commits on Dec 5, 2011
  1. Mark Story
  2. Kyle Robinson Young
  3. José Lorenzo Rodríguez

    Merge pull request #351 from shin1x1/1.3

    lorenzo authored
    The patch for PHP5.4 and Built-in web server
Commits on Dec 6, 2011
  1. Mark Story

    Merge pull request #358 from shama/1.3

    markstory authored
    Fix TextHelper excerpt method to work as documented
Commits on Dec 9, 2011
  1. ADmad

    Element cache filename now properly includes extra param names passed…

    ADmad authored
    … along with 'cache' => true option. Fixes #2356
Commits on Dec 17, 2011
  1. ADmad

    Adding missing Model::create() when using Model::save() in a loop. Fi…

    ADmad authored
    …xing some code formatting and updating api doc blocks. Fixes #848
Commits on Dec 18, 2011
  1. ADmad
Commits on Dec 28, 2011
  1. Mark Story
Commits on Dec 29, 2011
  1. Mark Story

    Update version to 1.3.14

    markstory authored
Commits on Jan 6, 2012
  1. Mark Story

    Fix singularization of 'foes'

    markstory authored
    Fixes #2424
Commits on Jan 8, 2012
  1. Mark Story

    Fix issue with find(count) and translated conditions.

    markstory authored
    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
Commits on Jan 10, 2012
  1. Mark Story
Commits on Jan 13, 2012
  1. Mark Story
Commits on Jan 19, 2012
  1. Walter Nasich
Commits on Jan 20, 2012
  1. Mark Story

    Merge pull request #426 from wnasich/1.3

    markstory authored
    Fixes ticket #2489
  2. Mark Story

    Merge pull request #284 from Phally/1.3-validation

    markstory authored
    Validation always does a count query
  3. Ber Clausen

    Fix a bug introduced when generating partial compatibility between 1.3

    bar authored
    and 2.0 Cookies, where an empty valued key caused a PHP notice. Also,
    harden tests. Completes the fix for #2131.
Commits on Jan 21, 2012
  1. Mark Story

    Merge pull request #435 from bar/cookie-2.0-compatibility

    markstory authored
    Cookie 2.0 compatibility
  2. Mark Story

    Fix header stripping.

    markstory authored
    To/Bcc/Cc need to be prefixed with new lines to be a successful
    injection.  Check for that instead of other letters.
    
    Fixes #2484
Commits on Feb 2, 2012
  1. Mark Story
Commits on Feb 11, 2012
  1. Mark Story

    Make code in 1.3 the same as 2.0

    markstory authored
    Fixes #2561
Commits on Feb 18, 2012
  1. Mark Story

    Fix duplicate items in HABTM associations.

    markstory authored
    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
  2. David Kullmann

    Added test for caching of SELECTS, but, not other statements which ha…

    dkullmann authored
    …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>
Commits on Feb 19, 2012
  1. Mark Story

    Merge pull request #492 from dkullmann/1.3-fix-cache-regex

    markstory authored
    1.3 fix cache regex
Commits on Feb 22, 2012
  1. Tien Van Vo

    Fixed #2591

    vantienvnn authored
  2. Mark Story

    Merge pull request #513 from vantienvnn/1.3

    markstory authored
    Cookie component small optimization
Commits on Mar 12, 2012
  1. Hiroki Shimizu
  2. Mark Story

    Merge pull request #556 from hiromi2424/1.3-fix-error-excerpt

    markstory authored
    1.3 fix error excerpt
Commits on Mar 13, 2012
  1. Juan Basso

    Updated copyright to 2012.

    jrbasso authored
Commits on Mar 18, 2012
  1. ceeram

    add .travis.yml file

    ceeram authored
Commits on Mar 25, 2012
  1. Mark Story

    Remove bogus test.

    markstory authored
    It was failing as the method handling was wonky.
Commits on Mar 29, 2012
  1. Mark Story

    Update version numbers to 1.3.15

    markstory authored
    Fixes #2725
Commits on Apr 19, 2012
  1. rassar
Something went wrong with that request. Please try again.