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 @@
 <?php
-/* vim: expandtab sw=4 ts=4 sts=4: */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * searchs the entire database
  *
diff --git a/error.php b/error.php
index 6fe920dd4..a1d8529c1 100644
--- a/error.php
+++ b/error.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: expandtab sw=4 ts=4 sts=4: */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * phpMyAdmin fatal error display page
  *
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 6bb8a8288..689224bc8 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -553,6 +553,7 @@ class PMA_Config
         // they'll get an error if the autodetect code doesn't work
         $pma_absolute_uri = $this->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 @@
 <?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
  *
diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php
index 96516f080..9b89fb3c8 100644
--- a/libraries/sanitizing.lib.php
+++ b/libraries/sanitizing.lib.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: expandtab sw=4 ts=4 sts=4: */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
  * @version $Id$
diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php
index 7e7cf2ec4..14499ab28 100644
--- a/libraries/server_common.inc.php
+++ b/libraries/server_common.inc.php
@@ -1,5 +1,5 @@
 <?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_isSuperuser()
diff --git a/libraries/tbl_indexes.lib.php b/libraries/tbl_indexes.lib.php
index a05e94fd3..4644650f3 100644
--- a/libraries/tbl_indexes.lib.php
+++ b/libraries/tbl_indexes.lib.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: expandtab sw=4 ts=4 sts=4: */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * function library for handling table indexes
  *
diff --git a/server_binlog.php b/server_binlog.php
index 8d0e4d2d9..ce0b6a63d 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -1,5 +1,5 @@
 <?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
  *
diff --git a/tbl_change.php b/tbl_change.php
index 365c2b0c6..c1fc5845d 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: expandtab sw=4 ts=4 sts=4: */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
  * @version $Id$
diff --git a/tbl_create.php b/tbl_create.php
index 1c99836b4..1a00daa7d 100644
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: expandtab sw=4 ts=4 sts=4: */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @uses    $cfg['DefaultTabDatabase']
  * @uses    $GLOBALS['table']