TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing issues with files in modules/cms

This commit is contained in:
Stefan Talen 2014-10-18 12:03:48 +02:00
parent f85087eac6
commit 509e7d2a12
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/cms/classes/CmsCompoundObject.php
View File

@ -232,6 +232,7 @@ class CmsCompoundObject extends CmsObject
} else {
$content[] = $this->code;
}
}
$content[] = $this->markup;

3
modules/cms/classes/Controller.php
View File

@ -278,8 +278,9 @@ class Controller extends BaseController
$template = $this->twig->loadTemplate($this->page->getFullPath());
$this->pageContents = $template->render($this->vars);
CmsException::unmask();
} else
} else {
$this->pageContents = $apiResult;
}
/*
* Render the layout

9
modules/cms/twig/PlaceholderTokenParser.php
View File

@ -43,8 +43,9 @@ class PlaceholderTokenParser extends Twig_TokenParser
$body = $this->parser->subparse([$this, 'decidePlaceholderEnd'], true);
$stream->expect(Twig_Token::BLOCK_END_TYPE);
} else
} else {
$params = $this->loadParams($stream);
}
return new PlaceholderNode($name, $params, $body, $token->getLine(), $this->getTag());
}
@ -75,7 +76,11 @@ class PlaceholderTokenParser extends Twig_TokenParser
break;
default:
throw new Twig_Error_Syntax(sprintf('Invalid syntax in the placeholder tag. Line %s', $lineno), $stream->getCurrent()->getLine(), $stream->getFilename());
throw new Twig_Error_Syntax(
sprintf('Invalid syntax in the placeholder tag. Line %s', $lineno),
$stream->getCurrent()->getLine(),
$stream->getFilename()
);
break;
}
}