config.inc.php.new renamed in config.inc.default.php

2 files changed, 2 insertions, 9 deletions

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index dcfdc167..66710ecb 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -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');
 
diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php
index a77081a2..14e9dd93 100755
--- a/inc/poche/global.inc.php
+++ b/inc/poche/global.inc.php
@@ -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) {