Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-04-11 12:42:27 +02:00
commit f14e4bf3ef
3 changed files with 19 additions and 0 deletions

View File

@ -1675,6 +1675,14 @@ Main panel
in the configuration file, end users can't be allowed to change their
passwords.
.. config:option:: $cfg['ShowGitRevision']
:type: boolean
:default: true
Defines whether to display informations about the current Git revision (if
applicable) on the main panel.
Database structure
------------------

View File

@ -396,6 +396,10 @@ class PMA_Config
*/
function isGitRevision()
{
if (!$this->get('ShowGitRevision')) {
return false;
}
// caching
if (isset($_SESSION['is_git_revision'])) {
if ($_SESSION['is_git_revision']) {

View File

@ -3054,4 +3054,11 @@ $cfg['DefaultFunctions'] = array(
*/
$cfg['maxRowPlotLimit'] = 500;
/**
* Show Git revision if applicable
*
* @global boolean $cfg['ShowGitRevision']
*/
$cfg['ShowGitRevision'] = true;
?>