diff options
author | Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com> | 2013-10-07 13:19:34 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com> | 2013-10-07 13:19:34 +0200 |
commit | 031df528b611a5c6639c0d86636633da098d8aa2 (patch) | |
tree | 3e301eb1292eedbee21dc119e3cc87eb9047e90b /inc/poche | |
parent | 9d3b88b3796496b68e762d50904a7ab609edc9c3 (diff) | |
download | wallabag-031df528b611a5c6639c0d86636633da098d8aa2.tar.gz wallabag-031df528b611a5c6639c0d86636633da098d8aa2.tar.zst wallabag-031df528b611a5c6639c0d86636633da098d8aa2.zip |
bug fix #268: move POCHE_VERSION in index.php and change the name to avoid conflicts when updating
Diffstat (limited to 'inc/poche')
-rw-r--r-- | inc/poche/Poche.class.php | 4 | ||||
-rwxr-xr-x | inc/poche/config.inc.php.new | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 899d7356..245f6a13 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php | |||
@@ -366,8 +366,8 @@ class Poche | |||
366 | case 'config': | 366 | case 'config': |
367 | $dev = $this->getPocheVersion('dev'); | 367 | $dev = $this->getPocheVersion('dev'); |
368 | $prod = $this->getPocheVersion('prod'); | 368 | $prod = $this->getPocheVersion('prod'); |
369 | $compare_dev = version_compare(POCHE_VERSION, $dev); | 369 | $compare_dev = version_compare(POCHE, $dev); |
370 | $compare_prod = version_compare(POCHE_VERSION, $prod); | 370 | $compare_prod = version_compare(POCHE, $prod); |
371 | $themes = $this->getInstalledThemes(); | 371 | $themes = $this->getInstalledThemes(); |
372 | $tpl_vars = array( | 372 | $tpl_vars = array( |
373 | 'themes' => $themes, | 373 | 'themes' => $themes, |
diff --git a/inc/poche/config.inc.php.new b/inc/poche/config.inc.php.new index 255b97e6..99223c78 100755 --- a/inc/poche/config.inc.php.new +++ b/inc/poche/config.inc.php.new | |||
@@ -49,8 +49,6 @@ define ('CACHE', ROOT . '/cache'); | |||
49 | 49 | ||
50 | define ('PAGINATION', '10'); | 50 | define ('PAGINATION', '10'); |
51 | 51 | ||
52 | define ('POCHE_VERSION', '1.0.0'); | ||
53 | |||
54 | define ('POCKET_FILE', '/ril_export.html'); | 52 | define ('POCKET_FILE', '/ril_export.html'); |
55 | define ('READABILITY_FILE', '/readability'); | 53 | define ('READABILITY_FILE', '/readability'); |
56 | define ('INSTAPAPER_FILE', '/instapaper-export.html'); | 54 | define ('INSTAPAPER_FILE', '/instapaper-export.html'); |