Skip to content
Commits on Feb 9, 2013
  1. prepared the 1.12.2 release

    committed Feb 9, 2013
Commits on Feb 8, 2013
  1. updated CHANGELOG

    committed Feb 8, 2013
  2. added some missing tests

    committed Feb 8, 2013
  3. merged branch andrewjbaker/force-timezone (PR #964)

    This PR was merged into the master branch.
    
    Commits
    -------
    
    999b1c4 Force timezone setting in date filter
    
    Discussion
    ----------
    
    Force timezone setting in date filter
    
    In instances where the $time parameter to the DateTime ctor includes a timezone, the $timezone argument is ignored. This functionality extends to the date filter.
    
    http://uk3.php.net/manual/en/datetime.construct.php
    
    "The $timezone parameter and the current timezone are ignored when the $time parameter either is a UNIX timestamp (e.g. @9466848) or specifies a timezone (e.g. 2010-01-28T15:00:00+02:00)."
    
    Accepting this pull request is dependent on whether the desired functionality of the date filter should honour the PHP way of doing things, or the more logical and natural functionality anticipated by a Twig template designer; always ensuring the timezone passed into the date filter is applied.
    committed Feb 8, 2013
  4. merged branch deadbeef84/getglobals-before-addglobal-bug (PR #990)

    This PR was merged into the master branch.
    
    Commits
    -------
    
    667b274 Added unit test for bug when calling getGlobals() before addGlobal() on Twig_Environment.
    
    Discussion
    ----------
    
    Bug when calling getGlobals() before addGlobal() on Twig_Environment.
    
    There seems to be an issue when calling getGlobals() before addGlobal(), the globals wont get updated. It doesn't seem to matter if the global existed before the call to getGlobals(). An update of the globals can be forced by calling an additional getGlobals() after the addGlobal() call.
    
    I believe the problem has something to do with runtimeInitialized/extensionInitialized being set to true during rendering, but globals don't get updated during that phase.
    
    Not sure how to fix it so I'm just sending you a unit test showcasing the bug.
    committed Feb 8, 2013
  5. merged branch lyrixx/patch-5 (PR #989)

    This PR was merged into the master branch.
    
    Commits
    -------
    
    e2a068d [Doc] Updated template_from_string to use include function
    
    Discussion
    ----------
    
    [Doc] Updated template_from_string to use include function
    
    instead of include tag
    committed Feb 8, 2013
Commits on Feb 7, 2013
  1. @deadbeef84
Commits on Feb 6, 2013
  1. @lyrixx

    [Doc] Updated template_from_string to use include function

    instead of include tag
    lyrixx committed Feb 6, 2013
Commits on Feb 1, 2013
  1. merged branch fabpot/first-last (PR #977)

    This PR was merged into the master branch.
    
    Commits
    -------
    
    f8d4db4 added the first and last filters (closes #951)
    
    Discussion
    ----------
    
    added the first and last filters (closes #951)
    
    ---------------------------------------------------------------------------
    
    by acasademont at 2013-01-26T20:45:23Z
    
    👍 great! Using twig_slice is a nice thing, we can have string and traversable objects work also with the new filters
    
    ---------------------------------------------------------------------------
    
    by jankramer at 2013-01-30T17:39:31Z
    
    👍 Was actually just looking for this :) When do you think you'll merge this feature into master?
    committed Feb 1, 2013
Commits on Jan 31, 2013
  1. removed list of built-in items in the docs in favor of a link (easier…

    … to maintain and better for discoverability)
    committed Jan 31, 2013
  2. merged branch javiereguiluz/doc_fixes (PR #982)

    This PR was merged into the master branch.
    
    Commits
    -------
    
    aac6cb6 Fixes and minor additions to the docs.
    
    Discussion
    ----------
    
    Fixes and minor additions to the docs.
    committed Jan 31, 2013
  3. @javiereguiluz
Commits on Jan 27, 2013
  1. merged branch eXtreme/patch-1 (PR #978)

    This PR was merged into the master branch.
    
    Commits
    -------
    
    8f28e78 Missing code-block in doc/templates.rst
    
    Discussion
    ----------
    
    Missing code-block in doc/templates.rst
    
    Little tweak for docs.
    committed Jan 27, 2013
  2. @eXtreme
Commits on Jan 26, 2013
  1. tweaked previous merge

    committed Jan 26, 2013
  2. merged branch rybakit/constant (PR #966)

    This PR was merged into the master branch.
    
    Commits
    -------
    
    a1b7ec5 Tweak twig_constant()
    
    Discussion
    ----------
    
    Tweak twig_constant()
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2013-01-16T10:52:56Z
    
    Why is it better? The old version returns earlier.
    
    ---------------------------------------------------------------------------
    
    by rybakit at 2013-01-16T11:25:39Z
    
    It's better for several reasons, imho:
    1. Negation has gone, which is better for perception
    2. Single function exit point
    3. The same functionality in less code
    
    And what do you mean by "The old version returns earlier"?
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2013-01-16T13:33:22Z
    
    It means the old version uses a variable less and we prefer early return statements when possible.
    
    ---------------------------------------------------------------------------
    
    by rybakit at 2013-01-16T14:24:26Z
    
    @Tobion, but how could it be "earlier"? In both cases the ```return``` statement goes exactly after the condition check:
    
    1)
    ```php
    if (!$object) {                   // 1. check condition
        return constant($constant);   // 2. return result
    }
    ```
    2)
    ```php
    if ($object) {                    // 1. check condition
        // ...
    }
    
    return constant($constant);       // 2. return result
    ```
    Do you want to say that case 1) is faster?
    committed Jan 26, 2013
Commits on Jan 18, 2013
  1. merged branch iamdto/master (PR #969)

    This PR was merged into the master branch.
    
    Commits
    -------
    
    9d25425 Fixed typo that messes up with syntax highlighting
    
    Discussion
    ----------
    
    [Documentation] Fixed typo
    committed Jan 18, 2013
  2. @iamdto
Commits on Jan 16, 2013
  1. removed SVN instructions

    committed Jan 16, 2013
  2. merged branch bamarni/patch-1 (PR #967)

    This PR was merged into the master branch.
    
    Commits
    -------
    
    d5de5e6 [doc] Installation - recommended Composer instead of tarball
    
    Discussion
    ----------
    
    [doc] Installation - recommended Composer instead of tarball
    committed Jan 16, 2013
  3. @bamarni
  4. @rybakit

    Tweak twig_constant()

    rybakit committed Jan 16, 2013
Commits on Jan 15, 2013
  1. bumped version to 1.12.2-DEV

    committed Jan 15, 2013
  2. prepared the 1.12.1 release

    committed Jan 15, 2013
  3. tweaked previous merge

    committed Jan 15, 2013
  4. merged branch markstory/object-constants (PR #961)

    This PR was merged into the master branch.
    
    Commits
    -------
    
    8bb953c Fix doc block for twig_constant.
    c7dafb7 Update documentation for constant()
    cb921ce Implement getting constants from objects.
    998b367 Add tests for getting constants from instances.
    
    Discussion
    ----------
    
    Object constants
    
    Implement the changes discussed in #954.
    committed Jan 15, 2013
Commits on Jan 14, 2013
  1. Force timezone setting in date filter

    Andrew Baker committed Jan 14, 2013
Commits on Jan 11, 2013
  1. @markstory
  2. @markstory
Something went wrong with that request. Please try again.