moparisthebest/wallabag
1
0
Fork 0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-27 11:22:17 -05:00
Code Issues Releases Wiki Activity

bug fix #364 - RSS Feed URL problem with + sign

Browse Source
This commit is contained in:
Nicolas Lœuillet 2014-02-12 19:58:49 +01:00
parent 445a1a1c8d
commit 044bf638a8
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
inc/poche/Poche.class.php
View File

@ -228,10 +228,6 @@ class Poche
# filter for reading time # filter for reading time
$filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime'); $filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime');
$this->tpl->addFilter($filter); $this->tpl->addFilter($filter);
# filter for simple filenames in config view
$filter = new Twig_SimpleFilter('getPrettyFilename', function($string) { return str_replace(ROOT, '', $string); });
$this->tpl->addFilter($filter);
} }
private function install() private function install()
@ -480,8 +476,8 @@ class Poche
switch ($view) switch ($view)
{ {
case 'config': case 'config':
$dev = $this->getPocheVersion('dev'); $dev = trim($this->getPocheVersion('dev'));
$prod = $this->getPocheVersion('prod'); $prod = trim($this->getPocheVersion('prod'));
$compare_dev = version_compare(POCHE, $dev); $compare_dev = version_compare(POCHE, $dev);
$compare_prod = version_compare(POCHE, $prod); $compare_prod = version_compare(POCHE, $prod);
$themes = $this->getInstalledThemes(); $themes = $this->getInstalledThemes();
@ -745,7 +741,6 @@ class Poche
{ {
$this->user = array(); $this->user = array();
Session::logout(); Session::logout();
$this->messages->add('s', _('see you soon!'));
Tools::logm('logout'); Tools::logm('logout');
Tools::redirect(); Tools::redirect();
} }
@ -1009,6 +1004,7 @@ class Poche
$token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20); $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
} }
$token = str_replace('+', '', $token);
$this->store->updateUserConfig($this->user->getId(), 'token', $token); $this->store->updateUserConfig($this->user->getId(), 'token', $token);
$currentConfig = $_SESSION['poche_user']->config; $currentConfig = $_SESSION['poche_user']->config;
$currentConfig['token'] = $token; $currentConfig['token'] = $token;