Merge branch '0.8.x' into 0.9.x

[quix0rs-gnu-social.git] / install.php
diff --git a/install.php b/install.php

index 42d848911b820c9a599cda32a8849116834e94a2..dc42a5b3dba2d5d477c0e897929526f17a69ecf6 100644 (file)
--- a/install.php
+++ b/install.php
@@ -379,7 +379,7 @@ function writeConf($sitename, $server, $path, $fancy, $db)
  
              // database
              "\$config['db']['database'] = '{$db['database']}';\n\n".
-            ($db['type'] == 'pgsql' ? "\$config['db']['quote_identifiers'] = true;\n\n":'').
+            ($type == 'pgsql' ? "\$config['db']['quote_identifiers'] = true;\n\n":'').
              "\$config['db']['type'] = '{$db['type']}';\n\n".
  
              "?>";
@@ -425,7 +425,9 @@ function runDbScript($filename, $conn, $type = 'mysql')
  
  ?>
  <?php echo"<?"; ?> xml version="1.0" encoding="UTF-8" <?php echo "?>"; ?>
-<!DOCTYPE html>
+<!DOCTYPE html
+PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US" lang="en_US">
      <head>
          <title>Install StatusNet</title>