Fix merge conflicts

2013-07-13 19:30:11 -04:00 · 2013-07-13 19:30:11 -04:00 · 90d968b447
commit 90d968b447
parent 8e4fe7c57a
2 changed files with 9 additions and 1 deletions
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@ -557,7 +557,11 @@ $cfg['ServerDefault'] = 1;
 *
 * @global boolean $cfg['VersionCheck']
 */
-$cfg['VersionCheck'] = VERSION_CHECK_DEFAULT;
+if (defined('VERSION_CHECK_DEFAULT')) {
+    $cfg['VersionCheck'] = VERSION_CHECK_DEFAULT;
+} else {
+    $cfg['VersionCheck'] = true;
+}

 /**
 * maximum number of db's displayed in database list
--- a/libraries/plugins/auth/swekey/swekey.auth.lib.php
+++ b/libraries/plugins/auth/swekey/swekey.auth.lib.php
@ -3,6 +3,10 @@
 * @package Swekey
 */

+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
 * Checks Swekey authentication.
 */