From b800466c912d1f2560992bbbe862a23b4c530913 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 19 Mar 2007 16:55:30 +0000 Subject: [PATCH] avoid vim error on loading --- db_search.php | 2 +- error.php | 2 +- libraries/Config.class.php | 2 +- libraries/import.lib.php | 2 +- libraries/sanitizing.lib.php | 2 +- libraries/server_common.inc.php | 2 +- libraries/tbl_indexes.lib.php | 2 +- server_binlog.php | 2 +- tbl_change.php | 2 +- tbl_create.php | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/db_search.php b/db_search.php index c26374336..3886f91d2 100644 --- a/db_search.php +++ b/db_search.php @@ -1,5 +1,5 @@ get('PmaAbsoluteUri'); $is_https = $this->get('is_https'); + if (strlen($pma_absolute_uri) < 5 // needed to catch http/https switch || ($is_https && substr($pma_absolute_uri, 0, 6) != 'https:') @@ -685,7 +686,6 @@ class PMA_Config . $pma_absolute_uri; } } - $this->set('PmaAbsoluteUri', $pma_absolute_uri); } diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 2a14cc6d6..844d67f8b 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -1,5 +1,5 @@