alternative random function to fix #1082

[github/wallabag/wallabag.git] / inc / poche / Poche.class.php

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 6d4ce1377daea3d5e9760325d498ad7c66775832..4b85d52fb3d23c2868ce57f57bd8c0308400bcdf 100755 (executable)
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -393,13 +393,12 @@ class Poche
                 
             /* For some unknown reason I can't get displayView() to work here (it redirects to home view afterwards). So here's a dirty fix which redirects directly to URL */
             case 'random':
-                $id = 0;
-                while ($this->store->retrieveOneById($id,$this->user->getId()) == null) {
-                    $count = $this->store->getEntriesByViewCount($view, $this->user->getId());
-                    $id = rand(1,$count);
-                }
+                $count = $this->store->getEntriesByViewCount($view, $this->user->getId());
+                $id_query = $this->store->getRandomId(rand(1,$count)-1, $this->user->getId());
+                $id = $id_query[0];
                 Tools::logm('get a random article');
-                Tools::redirect('?view=view&id=' . $id);
+                Tools::redirect('?view=view&id=' . $id[0]);
+                
                 //$this->displayView('view', $id);
                 break;
             default: