Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
f14e4bf3ef
@ -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
|
||||
------------------
|
||||
|
||||
|
||||
@ -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']) {
|
||||
|
||||
@ -3054,4 +3054,11 @@ $cfg['DefaultFunctions'] = array(
|
||||
*/
|
||||
$cfg['maxRowPlotLimit'] = 500;
|
||||
|
||||
/**
|
||||
* Show Git revision if applicable
|
||||
*
|
||||
* @global boolean $cfg['ShowGitRevision']
|
||||
*/
|
||||
$cfg['ShowGitRevision'] = true;
|
||||
|
||||
?>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user