Skip to content
Snippets Groups Projects
Commit 65bf49a4 authored by Tim Steiner's avatar Tim Steiner
Browse files

[gh-267] Merging from testing into staging

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@1345 20a16fea-79d4-4915-8869-1ea9d5ebf173
parent 9034a3a1
No related branches found
No related tags found
No related merge requests found
......@@ -100,7 +100,7 @@ else {
if ($page['sidebar_first']) {
$t->maincontentarea .= render($page['sidebar_first']) . PHP_EOL;
}
$t->maincontentarea .= strtr(render($page['content']), array('sticky-enabled' => 'zentable cool')) . PHP_EOL;
$t->maincontentarea .= render($page['content']) . PHP_EOL;
if ($page['sidebar_second']) {
$t->maincontentarea .= render($page['sidebar_second']) . PHP_EOL;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment