From ff455cc96a299f346467941660edfb327850d940 Mon Sep 17 00:00:00 2001 From: Alexander Filippov Date: Sun, 15 Apr 2012 12:40:14 +0000 Subject: [PATCH] fixed error: Parse error: syntax error, unexpected '[' in ./libraries/display_git_revision.lib.php on line 56 --- libraries/display_git_revision.lib.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libraries/display_git_revision.lib.php b/libraries/display_git_revision.lib.php index b31ce8a361..85dda17000 100644 --- a/libraries/display_git_revision.lib.php +++ b/libraries/display_git_revision.lib.php @@ -49,20 +49,22 @@ function PMA_printGitRevision() } ob_start(); + $committer = $GLOBALS['PMA_Config']->get('PMA_VERSION_GIT_COMMITTER'); + $author = $GLOBALS['PMA_Config']->get('PMA_VERSION_GIT_AUTHOR'); PMA_printListItem(__('Git revision') . ': ' . $branch . ',
' . sprintf( __('committed on %s by %s'), - PMA_localisedDate(strtotime($GLOBALS['PMA_Config']->get('PMA_VERSION_GIT_COMMITTER')['date'])), - '' - . htmlspecialchars($GLOBALS['PMA_Config']->get('PMA_VERSION_GIT_COMMITTER')['name']) . '') - . ($GLOBALS['PMA_Config']->get('PMA_VERSION_GIT_AUTHOR') != $GLOBALS['PMA_Config']->get('PMA_VERSION_GIT_COMMITTER') + PMA_localisedDate(strtotime($committer['date'])), + '' + . htmlspecialchars($committer['name']) . '') + . ($author != $committer ? ',
' . sprintf( __('authored on %s by %s'), - PMA_localisedDate(strtotime($GLOBALS['PMA_Config']->get('PMA_VERSION_GIT_AUTHOR')['date'])), - '' - . htmlspecialchars($GLOBALS['PMA_Config']->get('PMA_VERSION_GIT_AUTHOR')['name']) . '') + PMA_localisedDate(strtotime($author['date'])), + '' + . htmlspecialchars($author['name']) . '') : ''), 'li_pma_version_git', null, null, null); $item = ob_get_contents();