Merge branch '3.8'

lib/classes/databox.php

@@ -148,7 +148,7 @@ class databox extends base
         }
 
         if (!$row) {
-            throw new NotFoundHttpException(sprintf('databox %d not found', $sbas_id));
+            throw new NotFoundHttpException(sprintf('databox %d not found', $this->id));
         }
 
         $this->ord = $row['ord'];

lib/classes/module/report/dashboard/feed.php

@@ -72,7 +72,10 @@ class module_report_dashboard_feed implements module_report_dashboard_componentI
         $cache_id = 'feed_' . md5($sbasid . '_' . $sbas_coll . '_' . $dmin . '_' . $dmax);
 
         try {
-            return $app['phraseanet.appbox']->get_data_from_cache($cache_id);
+            $result = $app['phraseanet.appbox']->get_data_from_cache($cache_id);
+            $result->setApplication($app);
+
+            return $result;
         } catch (Exception $e) {
 
         }
@@ -231,4 +234,21 @@ class module_report_dashboard_feed implements module_report_dashboard_componentI
             return false;
         }
     }
+
+    private function setApplication(Application $app)
+    {
+        $this->app = $app;
+    }
+
+    public function __sleep()
+    {
+        $vars = array();
+        foreach ($this as $key => $value) {
+            if (in_array($key, array('app')))
+                continue;
+            $vars[] = $key;
+        }
+
+        return $vars;
+    }
 }

lib/classes/patch/380a3.php

@@ -58,7 +58,6 @@ class patch_380a3 implements patchInterface
     {
         $conn = $databox->get_connection();
 
-        try {
         $removeProc = "DROP PROCEDURE IF EXISTS explode_log_table";
 
         $stmt = $conn->prepare($removeProc);
@@ -112,16 +111,16 @@ class patch_380a3 implements patchInterface
         $stmt = $conn->prepare($procedure);
         $stmt->execute();
         $stmt->closeCursor();
-            unset($stmt);
 
         $sql = "CALL explode_log_table(',')";
         $stmt = $conn->prepare($sql);
         $stmt->execute();
         $stmt->closeCursor();
-            unset($stmt);
+
-        } catch (\PDOEXception $e) {
+
-            return false;
+        $stmt = $conn->prepare($removeProc);
-        }
+        $stmt->execute();
+        $stmt->closeCursor();
             
         return true;
     }

www/skins/prod/Basket.css

@@ -1,3 +1,9 @@
+#BasketBrowser h1 {
+    font-size: 14px;
+    line-height: 20px;
+    margin: 0;
+    padding: 0;
+}
 #BasketBrowser .Browser{
   background-color: #111111;
 }
@@ -13,6 +19,9 @@
   position:relative;
   height:100px;
 }
+#BasketBrowser .result .PNB10 {
+    overflow: hidden;
+}
 
 #BasketBrowser .results .datas{
   top:50px;
@@ -49,6 +58,7 @@
     box-shadow: none;
     line-height: 18px;
     text-align: center;
+    vertical-align:top;
 }
 
 #BasketBrowser .result td.thumbnail .counter{