Permalink
Browse files

Removed a ternary shortcut (to support PHP5.3)

  • Loading branch information...
1 parent ab7e081 commit 0992a798660a15467b6ab96b253d8b640dc5d7b7 @kolber committed Mar 18, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 app/page-data.inc.php
View
2 app/page-data.inc.php
@@ -195,7 +195,7 @@ static function create_textfile_vars($page) {
$shared_file_path = file_exists('./content/_shared.yml') ? './content/_shared.yml' : './content/_shared.txt';
if (file_exists($shared_file_path)) {
if ($shared_vars = sfYaml::load($shared_file_path)) {
- $vars = array_merge($shared_vars, $vars ?: array());
+ $vars = array_merge($shared_vars, $vars ? $vars : array());
}
}
if (empty($vars)) {

0 comments on commit 0992a79

Please sign in to comment.