Removed $dbTablePrefix definition as defineTablePrefix() will do the same

This commit is contained in:
Tobias Reich 2016-01-19 11:57:16 +01:00
parent 1019b0fef1
commit 33e16041af
5 changed files with 5 additions and 9 deletions

View File

@ -33,8 +33,7 @@ if (!empty($_POST['function'])||!empty($_GET['function'])) {
} }
# Define the table prefix # Define the table prefix
if (!isset($dbTablePrefix)) $dbTablePrefix = ''; defineTablePrefix(@$dbTablePrefix);
defineTablePrefix($dbTablePrefix);
# Connect to database # Connect to database
$database = Database::connect($dbHost, $dbUser, $dbPassword, $dbName); $database = Database::connect($dbHost, $dbUser, $dbPassword, $dbName);

View File

@ -34,7 +34,7 @@ define('LYCHEE_URL_UPLOADS_THUMB', 'uploads/thumb/');
function defineTablePrefix($dbTablePrefix) { function defineTablePrefix($dbTablePrefix) {
# This part is wrapped into a function, because it needs to be called # This part is wrapped into a function, because it needs to be called
# after the config-file has been loaded. Other defines are also available # after the config-file has been loaded. Other defines are available
# before the config-file has been loaded. # before the config-file has been loaded.
# Parse table prefix # Parse table prefix

View File

@ -56,8 +56,7 @@ if (!file_exists(LYCHEE_CONFIG_FILE)) exit('Error: Configuration not found. Plea
else require(LYCHEE_CONFIG_FILE); else require(LYCHEE_CONFIG_FILE);
# Define the table prefix # Define the table prefix
if (!isset($dbTablePrefix)) $dbTablePrefix = ''; defineTablePrefix(@$dbTablePrefix);
defineTablePrefix($dbTablePrefix);
# Database # Database
$database = new mysqli($dbHost, $dbUser, $dbPassword, $dbName); $database = new mysqli($dbHost, $dbUser, $dbPassword, $dbName);

View File

@ -23,8 +23,7 @@ if (!file_exists(LYCHEE_CONFIG_FILE)) exit('Error 001: Configuration not found.
require(LYCHEE_CONFIG_FILE); require(LYCHEE_CONFIG_FILE);
# Define the table prefix # Define the table prefix
if (!isset($dbTablePrefix)) $dbTablePrefix = ''; defineTablePrefix(@$dbTablePrefix);
defineTablePrefix($dbTablePrefix);
# Declare # Declare
$result = ''; $result = '';

View File

@ -29,8 +29,7 @@
require(LYCHEE_CONFIG_FILE); require(LYCHEE_CONFIG_FILE);
# Define the table prefix # Define the table prefix
if (!isset($dbTablePrefix)) $dbTablePrefix = ''; defineTablePrefix(@$dbTablePrefix);
defineTablePrefix($dbTablePrefix);
$database = Database::connect($dbHost, $dbUser, $dbPassword, $dbName); $database = Database::connect($dbHost, $dbUser, $dbPassword, $dbName);