mirror of
https://github.com/moparisthebest/wallabag
synced 2024-12-23 15:58:55 -05:00
config.inc.php.new renamed in config.inc.default.php
This commit is contained in:
parent
a4a870e1ec
commit
43c7b978c3
@ -101,7 +101,7 @@ class Poche
|
||||
|
||||
public function configFileIsAvailable() {
|
||||
if (! self::$configFileAvailable) {
|
||||
$this->notInstalledMessage[] = 'You have to rename inc/poche/config.inc.php.new to inc/poche/config.inc.php.';
|
||||
$this->notInstalledMessage[] = 'You have to copy (don\'t just rename!) inc/poche/config.inc.default.php to inc/poche/config.inc.php.';
|
||||
|
||||
return false;
|
||||
}
|
||||
@ -834,13 +834,6 @@ class Poche
|
||||
*/
|
||||
public function import() {
|
||||
|
||||
if (!defined('IMPORT_LIMIT')) {
|
||||
define('IMPORT_LIMIT', 5);
|
||||
}
|
||||
if (!defined('IMPORT_DELAY')) {
|
||||
define('IMPORT_DELAY', 5);
|
||||
}
|
||||
|
||||
if ( isset($_FILES['file']) ) {
|
||||
Tools::logm('Import stated: parsing file');
|
||||
|
||||
|
@ -43,7 +43,7 @@ if (! file_exists(INCLUDES . '/poche/config.inc.php')) {
|
||||
Poche::$configFileAvailable = false;
|
||||
} else {
|
||||
require_once INCLUDES . '/poche/config.inc.php';
|
||||
require_once INCLUDES . '/poche/config.inc.php.new';
|
||||
require_once INCLUDES . '/poche/config.inc.default.php';
|
||||
}
|
||||
|
||||
if (Poche::$configFileAvailable && DOWNLOAD_PICTURES) {
|
||||
|
2
install/index.php
Normal file → Executable file
2
install/index.php
Normal file → Executable file
@ -53,7 +53,7 @@ else if (isset($_POST['install'])) {
|
||||
else {
|
||||
$continue = true;
|
||||
// Create config.inc.php
|
||||
if (!copy('inc/poche/config.inc.php.new', 'inc/poche/config.inc.php')) {
|
||||
if (!copy('inc/poche/config.inc.default.php', 'inc/poche/config.inc.php')) {
|
||||
$errors[] = 'Installation aborted, impossible to create inc/poche/config.inc.php file. Maybe you don\'t have write access to create it.';
|
||||
$continue = false;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user