3 files changed, 12 insertions, 3 deletions

diff --git a/inc/3rdparty/simplepie/SimplePie/Misc.php b/inc/3rdparty/simplepie/SimplePie/Misc.php
index eabf2738..17dbf963 100644
--- a/inc/3rdparty/simplepie/SimplePie/Misc.php
+++ b/inc/3rdparty/simplepie/SimplePie/Misc.php
@@ -1613,6 +1613,7 @@ class SimplePie_Misc
                         case 'utf7':
                                 return 'UTF-7';
 
+                        case 'utf8lias':
                         case 'utf8':
                                 return 'UTF-8';
 
diff --git a/inc/3rdparty/site_config/custom/dilbert.com.txt b/inc/3rdparty/site_config/custom/dilbert.com.txt
new file mode 100644
index 00000000..6c8d95a2
--- /dev/null
+++ b/inc/3rdparty/site_config/custom/dilbert.com.txt
@@ -0,0 +1,4 @@
+title: //div[contains(@class, 'SB_Title')]//a
+body: //div[contains(@class, 'STR_Content')]
+
+test_url: http://dilbert.com/strips/comic/2013-10-22
\ No newline at end of file
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 0766cd51..3ecaf084 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -327,7 +327,7 @@ class Poche
     /**
      * Call action (mark as fav, archive, delete, etc.)
      */
-    public function action($action, Url $url, $id = 0, $import = FALSE)
+    public function action($action, Url $url, $id = 0, $import = FALSE, $autoclose = FALSE)
     {
         switch ($action)
         {
@@ -358,7 +358,11 @@ class Poche
                 }
 
                 if (!$import) {
-                    Tools::redirect('?view=home');
+                    if ($autoclose == TRUE) {
+                      Tools::redirect('?view=home');
+                    } else {
+                      Tools::redirect('?view=home&closewin=true');
+                    }
                 }
                 break;
             case 'delete':
@@ -374,7 +378,7 @@ class Poche
                     $msg = 'error : can\'t delete link #' . $id;
                 }
                 Tools::logm($msg);
-                Tools::redirect();
+                Tools::redirect('?');
                 break;
             case 'toggle_fav' :
                 $this->store->favoriteById($id, $this->user->getId());