Merge pull request #35 from krouma/master

Fixes for PHP 7
janzarsky · Nov 21, 2019 · 9b0f06b · 9b0f06b
2 parents eda505c + 5fe91d8
commit 9b0f06b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/application/config/database-template.php b/application/config/database-template.php
@@ -52,7 +52,7 @@
 $db['default']['username'] = '@username';
 $db['default']['password'] = '@password';
 $db['default']['database'] = '@database';
-$db['default']['dbdriver'] = 'mysql';
+$db['default']['dbdriver'] = 'mysqli';
 $db['default']['dbprefix'] = '@prefix';
 $db['default']['pconnect'] = TRUE;
 $db['default']['db_debug'] = TRUE;
@@ -66,4 +66,4 @@
 
 
 /* End of file database.php */
-/* Location: ./application/config/database.php */
+/* Location: ./application/config/database.php */
diff --git a/install.php b/install.php
@@ -1,11 +1,11 @@
 <?php
 $base = $_SERVER['REQUEST_URI'];
-$base = substr($base, 0, strpos($base, '/install.php'));
+$base = substr($base, 0, strpos($base, 'install.php'));
 
 $htaccess = file_get_contents('htaccess-template');
 
 $htaccess = str_replace('@rewritebase', $base, $htaccess);
 
 file_put_contents('.htaccess', $htaccess);
 
-header('Location: ' . $base . '/install');
+header('Location: ' . $base . 'install');