avoid vim error on loading

This commit is contained in:
Marc Delisle
2007-03-19 16:55:30 +00:00
parent 24c8f9a4de
commit b800466c91
10 changed files with 10 additions and 10 deletions

View File

@@ -1,5 +1,5 @@
<?php <?php
/* vim: expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* searchs the entire database * searchs the entire database
* *

View File

@@ -1,5 +1,5 @@
<?php <?php
/* vim: expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* phpMyAdmin fatal error display page * phpMyAdmin fatal error display page
* *

View File

@@ -553,6 +553,7 @@ class PMA_Config
// they'll get an error if the autodetect code doesn't work // they'll get an error if the autodetect code doesn't work
$pma_absolute_uri = $this->get('PmaAbsoluteUri'); $pma_absolute_uri = $this->get('PmaAbsoluteUri');
$is_https = $this->get('is_https'); $is_https = $this->get('is_https');
if (strlen($pma_absolute_uri) < 5 if (strlen($pma_absolute_uri) < 5
// needed to catch http/https switch // needed to catch http/https switch
|| ($is_https && substr($pma_absolute_uri, 0, 6) != 'https:') || ($is_https && substr($pma_absolute_uri, 0, 6) != 'https:')
@@ -685,7 +686,6 @@ class PMA_Config
. $pma_absolute_uri; . $pma_absolute_uri;
} }
} }
$this->set('PmaAbsoluteUri', $pma_absolute_uri); $this->set('PmaAbsoluteUri', $pma_absolute_uri);
} }

View File

@@ -1,5 +1,5 @@
<?php <?php
/* vim: expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* Library that provides common import functions that are used by import plugins * Library that provides common import functions that are used by import plugins
* *

View File

@@ -1,5 +1,5 @@
<?php <?php
/* vim: expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* *
* @version $Id$ * @version $Id$

View File

@@ -1,5 +1,5 @@
<?php <?php
/* vim: expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* @uses PMA_generate_common_url() * @uses PMA_generate_common_url()
* @uses PMA_isSuperuser() * @uses PMA_isSuperuser()

View File

@@ -1,5 +1,5 @@
<?php <?php
/* vim: expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* function library for handling table indexes * function library for handling table indexes
* *

View File

@@ -1,5 +1,5 @@
<?php <?php
/* vim: expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* display the binary logs and the content of the selected * display the binary logs and the content of the selected
* *

View File

@@ -1,5 +1,5 @@
<?php <?php
/* vim: expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* *
* @version $Id$ * @version $Id$

View File

@@ -1,5 +1,5 @@
<?php <?php
/* vim: expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* @uses $cfg['DefaultTabDatabase'] * @uses $cfg['DefaultTabDatabase']
* @uses $GLOBALS['table'] * @uses $GLOBALS['table']