Permalink
Switch branches/tags
Commits on Dec 22, 2011
  1. added a do tag (closes #446)

    committed Dec 22, 2011
  2. added doc for the flush tag

    committed Dec 22, 2011
  3. tweaked doc (closes #567)

    committed Dec 22, 2011
  4. replaced zend_error_noreturn calls to zend_error as zend_error_noretu…

    …rn is not exported (closes #554)
    committed Dec 22, 2011
Commits on Dec 21, 2011
  1. merged branch arnaud-lb/ext-fix (PR #565)

    Commits
    -------
    
    b26d69a removed bogus TSRMLS_CCs
    
    Discussion
    ----------
    
    Fix strict mode in extension when building in ZTS mode
    
    This removes a few misplaced TSRMLS_CCs causing if() expressions to always evaluate to true. This caused twig_template_get_attributes to always behave as if strict mode were disabled.
    committed Dec 21, 2011
  2. fixed typo

    committed Dec 21, 2011
  3. removed bogus TSRMLS_CCs

    arnaud-lb committed Dec 21, 2011
  4. added a flush tag

    committed Dec 21, 2011
  5. merged branch nikic/fixLoopIncrement (PR #563)

    Commits
    -------
    
    8255b8b Fix test for previous commit
    834ce4c Fix loop increment on some for loops (fix #562)
    
    Discussion
    ----------
    
    Fix loop increment
    
    PR for #562.
    committed Dec 21, 2011
  6. Fix test for previous commit

    nikic committed Dec 21, 2011
  7. Fix loop increment on some for loops (fix #562)

    The inner loop incrementing code was not added on for loops where the body was not a Twig_Node (but e.g. a Twig_Node_If)
    nikic committed Dec 21, 2011
Commits on Dec 18, 2011
  1. fixed the random function

    committed Dec 18, 2011
  2. added a nl2br filter

    committed Dec 18, 2011
  3. added a random function

    committed Dec 18, 2011
Commits on Dec 17, 2011
  1. merged branch arnaud-lb/ext-crash2 (PR #560)

    Commits
    -------
    
    9e6f285 fixed crash in twig_template_get_attributes when input is not an array or object
    
    Discussion
    ----------
    
    Fix crash in twig_template_get_attributes when input is not an array or object
    
    This fixes a crash when the input of twig_template_get_attributes() is not an array or object, and strict mode is enabled.
    
    ---------------------------------------------------------------------------
    
    by nikic at 2011/12/16 12:03:21 -0800
    
    Could you maybe place the exception tests in a different method?
    
    ---------------------------------------------------------------------------
    
    by arnaud-lb at 2011/12/16 12:13:35 -0800
    
    This method already expects many of its inputs to cause an exception to be thrown (it tests getAttribute() in strict mode, and in many cases the attribute isn't defined). I don't see a real benefit from moving these tests in a separate method in this case.
    committed Dec 17, 2011
Commits on Dec 16, 2011
  1. updated NetBeans plugin URL

    committed Dec 16, 2011
Commits on Dec 11, 2011
  1. merged branch arnaud-lb/ext-crash (PR #558)

    Commits
    -------
    
    c920344 code style
    50da1a2 don't modify function name
    
    Discussion
    ----------
    
    Fix crash in extension
    
    This fixes a crash caused by `php_strtolower()` modifying its input. (Crashes on amd64, but not on x86 for me.)
    committed Dec 11, 2011
Commits on Dec 10, 2011
  1. code style

    arnaud-lb committed Dec 10, 2011
  2. don't modify function name

    arnaud-lb committed Dec 10, 2011
Commits on Dec 9, 2011
  1. merged branch JEDIBC/master (PR #556)

    Commits
    -------
    
    3bb822e . misspell function _twig_convert_encoding -> twig_convert_encoding
    
    Discussion
    ----------
    
    misspell function _twig_convert_encoding -> twig_convert_encoding
    
    Located in _twig_escape_js_callback, the function call was misspelled and raised a PHP Fatal error:  Call to undefined function _twig_convert_encoding() in ~/www/project/vendors/Twig/Extension/Core.php on line 585
    committed Dec 9, 2011
Commits on Dec 8, 2011
Commits on Dec 7, 2011