Project

General

Profile

« Previous | Next » 

Revision 1852

Added by darkviper over 11 years ago

updated Twig template engine to stable version 1.11.1 step2

View differences:

Extends.php
29 29 
    public function parse(Twig_Token $token)
30 30 
    {
31 31 
        if (!$this->parser->isMainScope()) {
32 
            throw new Twig_Error_Syntax('Cannot extend from a block', $token->getLine());
32 
            throw new Twig_Error_Syntax('Cannot extend from a block', $token->getLine(), $this->parser->getFilename());
33 33 
        }
34 34 

  		




  35
  35
  
    
        if (null !== $this->parser->getParent()) {


  		




  36
  
  
    
            throw new Twig_Error_Syntax('Multiple extends tags are forbidden', $token->getLine());


  		




  
  36
  
    
            throw new Twig_Error_Syntax('Multiple extends tags are forbidden', $token->getLine(), $this->parser->getFilename());


  		




  37
  37
  
    
        }


  		




  38
  38
  
    
        $this->parser->setParent($this->parser->getExpressionParser()->parseExpression());


  		




  39
  39
  
    

  		












Also available in:  Unified diff