diff --git a/export.php b/export.php
index 90b70dbca6..248633f2c0 100644
--- a/export.php
+++ b/export.php
@@ -298,25 +298,13 @@ if (!defined('TESTSUITE')) {
 
         // problem opening export file on server?
         if (! empty($message)) {
-            if ($export_type == 'server') {
-                $active_page = 'server_export.php';
-                include 'server_export.php';
-            } elseif ($export_type == 'database') {
-                $active_page = 'db_export.php';
-                include 'db_export.php';
-            } else {
-                $active_page = 'tbl_export.php';
-                include 'tbl_export.php';
-            }
-            exit();
+            PMA_showExportPage($export_type);
         }
-    }
-
-    /**
-     * Send headers depending on whether the user chose to download a dump file
-     * or not
-     */
-    if (! $save_on_server) {
+    } else {
+        /**
+         * Send headers depending on whether the user chose to download a dump file
+         * or not
+         */
         if ($asfile) {
             // Download
             // (avoid rewriting data containing HTML with anchors and forms;
@@ -414,17 +402,7 @@ if (!defined('TESTSUITE')) {
     // End of fake loop
 
     if ($save_on_server && ! empty($message)) {
-        if ($export_type == 'server') {
-            $active_page = 'server_export.php';
-            include 'server_export.php';
-        } elseif ($export_type == 'database') {
-            $active_page = 'db_export.php';
-            include 'db_export.php';
-        } else {
-            $active_page = 'tbl_export.php';
-            include 'tbl_export.php';
-        }
-        exit();
+        PMA_showExportPage($export_type);
     }
 
     /**
@@ -451,17 +429,7 @@ if (!defined('TESTSUITE')) {
             $message = PMA_closeExportFile(
                 $file_handle, $dump_buffer, $save_filename
             );
-            if ($export_type == 'server') {
-                $active_page = 'server_export.php';
-                include_once 'server_export.php';
-            } elseif ($export_type == 'database') {
-                $active_page = 'db_export.php';
-                include_once 'db_export.php';
-            } else {
-                $active_page = 'tbl_export.php';
-                include_once 'tbl_export.php';
-            }
-            exit();
+            PMA_showExportPage($export_type);
         } else {
             echo $dump_buffer;
         }
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 635b161a1a..ea3d60efbf 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -758,10 +758,10 @@ class PMA_Config
         }
         $data = @curl_exec($ch);
         if (! defined('TESTSUITE')) {
-            ini_set('session.use_only_cookies', false);
-            ini_set('session.use_cookies', false);
-            ini_set('session.use_trans_sid', false);
-            ini_set('session.cache_limiter', null);
+            ini_set('session.use_only_cookies', 'false');
+            ini_set('session.use_cookies', 'false');
+            ini_set('session.use_trans_sid', 'false');
+            ini_set('session.cache_limiter', 'nocache');
             session_start();
         }
         if ($data === false) {
diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index 1ef5f629f0..2e7bb6bad0 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -4238,10 +4238,10 @@ class PMA_Util
             && $save
         ) {
             if (! isset($_SESSION) && ! defined('TESTSUITE')) {
-                ini_set('session.use_only_cookies', false);
-                ini_set('session.use_cookies', false);
-                ini_set('session.use_trans_sid', false);
-                ini_set('session.cache_limiter', null);
+                ini_set('session.use_only_cookies', 'false');
+                ini_set('session.use_cookies', 'false');
+                ini_set('session.use_trans_sid', 'false');
+                ini_set('session.cache_limiter', 'nocache');
                 session_start();
             }
             $_SESSION['cache']['version_check'] = array(
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 5699031b6c..9e201c514b 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -70,7 +70,7 @@ if (version_compare(phpversion(), '5.4', 'lt')) {
     /**
      * Avoid problems with magic_quotes_runtime
      */
-    @ini_set('magic_quotes_runtime', false);
+    @ini_set('magic_quotes_runtime', 'false');
 }
 
 /**
diff --git a/libraries/config/Validator.class.php b/libraries/config/Validator.class.php
index 5a8e01e45e..bf0db13401 100644
--- a/libraries/config/Validator.class.php
+++ b/libraries/config/Validator.class.php
@@ -182,9 +182,9 @@ class PMA_Validator
             $old_track_errors = ini_get('track_errors');
             $old_display_errors = ini_get('display_errors');
             $old_error_reporting = error_reporting(E_ALL);
-            ini_set('html_errors', false);
-            ini_set('track_errors', true);
-            ini_set('display_errors', true);
+            ini_set('html_errors', 'false');
+            ini_set('track_errors', 'true');
+            ini_set('display_errors', 'true');
             set_error_handler(array("PMA_Validator", "nullErrorHandler"));
             ob_start();
         } else {
diff --git a/libraries/export.lib.php b/libraries/export.lib.php
index 37f3e0c05a..e8f6cfc83b 100644
--- a/libraries/export.lib.php
+++ b/libraries/export.lib.php
@@ -741,4 +741,26 @@ function PMA_exportTable(
         return;
     }
 }
+
+/**
+ * Loads correct page after doing export
+ *
+ * @param string $export_type Export type
+ *
+ * @return void
+ */
+function PMA_showExportPage($export_type)
+{
+    if ($export_type == 'server') {
+        $active_page = 'server_export.php';
+        include_once 'server_export.php';
+    } elseif ($export_type == 'database') {
+        $active_page = 'db_export.php';
+        include_once 'db_export.php';
+    } else {
+        $active_page = 'tbl_export.php';
+        include_once 'tbl_export.php';
+    }
+    exit();
+}
 ?>
diff --git a/libraries/session.inc.php b/libraries/session.inc.php
index 182af93fb3..254ce962c6 100644
--- a/libraries/session.inc.php
+++ b/libraries/session.inc.php
@@ -25,7 +25,7 @@ if (!@function_exists('session_name')) {
 
 // disable starting of sessions before all settings are done
 // does not work, besides how it is written in php manual
-//ini_set('session.auto_start', 0);
+//ini_set('session.auto_start', '0');
 
 // session cookie settings
 session_set_cookie_params(
@@ -34,7 +34,7 @@ session_set_cookie_params(
 );
 
 // cookies are safer (use @ini_set() in case this function is disabled)
-@ini_set('session.use_cookies', true);
+@ini_set('session.use_cookies', 'true');
 
 // optionally set session_save_path
 $path = $GLOBALS['PMA_Config']->get('SessionSavePath');
@@ -43,9 +43,9 @@ if (!empty($path)) {
 }
 
 // but not all user allow cookies
-@ini_set('session.use_only_cookies', false);
+@ini_set('session.use_only_cookies', 'false');
 // do not force transparent session ids, see bug #3398788
-//@ini_set('session.use_trans_sid', true);
+//@ini_set('session.use_trans_sid', 'true');
 @ini_set(
     'url_rewriter.tags',
     'a=href,frame=src,input=src,form=fakeentry,fieldset='
@@ -53,14 +53,14 @@ if (!empty($path)) {
 //ini_set('arg_separator.output', '&');
 
 // delete session/cookies when browser is closed
-@ini_set('session.cookie_lifetime', 0);
+@ini_set('session.cookie_lifetime', '0');
 
 // warn but dont work with bug
-@ini_set('session.bug_compat_42', false);
-@ini_set('session.bug_compat_warn', true);
+@ini_set('session.bug_compat_42', 'false');
+@ini_set('session.bug_compat_warn', 'true');
 
 // use more secure session ids
-@ini_set('session.hash_function', 1);
+@ini_set('session.hash_function', '1');
 
 // some pages (e.g. stylesheet) may be cached on clients, but not in shared
 // proxy servers