Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: laravel/laravel
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: rk/laravel
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 4 commits
  • 0 files changed
  • 1 contributor

Commits on Sep 24, 2012

  1. [#1261] get_key now pulls from $original instead 

    This is in reference to issue #1261, where Model->get_key() returns
the key from the $attributes instead of from the $original property.
This breaks the functionality of a model with a primary key that may
change, as the SQL generated will be something like:

UPDATE `model` SET `key` = 'new-key' WHERE `key` = 'new-key';

Which won't update the model in the database.
    @rk
    rk committed Sep 24, 2012
    Configuration menu
    Copy the full SHA
    5026a53 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:rk/laravel 

    Pulling the development branch.
    @rk
    rk committed Sep 24, 2012
    Configuration menu
    Copy the full SHA
    1a2983a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of git://github.com/laravel/laravel 

    Pulling upstream of the main develop branch.
    @rk
    rk committed Sep 24, 2012
    Configuration menu
    Copy the full SHA
    ff6600f View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2012

  1. Merging 3.2.10 changes, including reversion of my model change.

    @rk
    rk committed Oct 4, 2012
    Configuration menu
    Copy the full SHA
    575e58c View commit details
    Browse the repository at this point in the history
Loading