aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc
diff options
context:
space:
mode:
authorMaryana Rozhankivska <mariroz@mr.lviv.ua>2014-04-22 20:58:40 +0300
committerMaryana Rozhankivska <mariroz@mr.lviv.ua>2014-04-22 20:58:40 +0300
commit43c7b978c31bcbf9e8e5202ecbb7b6fccba6a7fa (patch)
treeb01c84788bc21a0f348d5f45e3e90d9e20f11194 /inc
parenta4a870e1ec3ee075b8c1020f9030859beb1f23da (diff)
downloadwallabag-43c7b978c31bcbf9e8e5202ecbb7b6fccba6a7fa.tar.gz
wallabag-43c7b978c31bcbf9e8e5202ecbb7b6fccba6a7fa.tar.zst
wallabag-43c7b978c31bcbf9e8e5202ecbb7b6fccba6a7fa.zip
config.inc.php.new renamed in config.inc.default.php
Diffstat (limited to 'inc')
-rwxr-xr-xinc/poche/Poche.class.php9
-rwxr-xr-xinc/poche/global.inc.php2
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
101 101
102 public function configFileIsAvailable() { 102 public function configFileIsAvailable() {
103 if (! self::$configFileAvailable) { 103 if (! self::$configFileAvailable) {
104 $this->notInstalledMessage[] = 'You have to rename inc/poche/config.inc.php.new to inc/poche/config.inc.php.'; 104 $this->notInstalledMessage[] = 'You have to copy (don\'t just rename!) inc/poche/config.inc.default.php to inc/poche/config.inc.php.';
105 105
106 return false; 106 return false;
107 } 107 }
@@ -834,13 +834,6 @@ class Poche
834 */ 834 */
835 public function import() { 835 public function import() {
836 836
837 if (!defined('IMPORT_LIMIT')) {
838 define('IMPORT_LIMIT', 5);
839 }
840 if (!defined('IMPORT_DELAY')) {
841 define('IMPORT_DELAY', 5);
842 }
843
844 if ( isset($_FILES['file']) ) { 837 if ( isset($_FILES['file']) ) {
845 Tools::logm('Import stated: parsing file'); 838 Tools::logm('Import stated: parsing file');
846 839
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')) {
43 Poche::$configFileAvailable = false; 43 Poche::$configFileAvailable = false;
44} else { 44} else {
45 require_once INCLUDES . '/poche/config.inc.php'; 45 require_once INCLUDES . '/poche/config.inc.php';
46 require_once INCLUDES . '/poche/config.inc.php.new'; 46 require_once INCLUDES . '/poche/config.inc.default.php';
47} 47}
48 48
49if (Poche::$configFileAvailable && DOWNLOAD_PICTURES) { 49if (Poche::$configFileAvailable && DOWNLOAD_PICTURES) {