Merge branch 'QA_4_8'

Signed-off-by: William Desportes <williamdes@wdes.fr>

1 files changed, 6 insertions, 6 deletions

diff --git a/libraries/classes/Database/Designer/Common.php b/libraries/classes/Database/Designer/Common.php
index 224110f4e1..8aeadbee27 100644
--- a/libraries/classes/Database/Designer/Common.php
+++ b/libraries/classes/Database/Designer/Common.php
@@ -315,7 +315,7 @@ class Common
      *
      * @param int $pg pdf page id
      *
-     * @return string table name
+     * @return string|null table name
      */
     public function getPageName($pg)
     {
@@ -335,7 +335,7 @@ class Common
             DatabaseInterface::CONNECT_CONTROL,
             DatabaseInterface::QUERY_STORE
         );
-        return count($page_name) ? $page_name[0] : null;
+        return ( is_array($page_name) && isset($page_name[0]) ) ? $page_name[0] : null;
     }
 
     /**
@@ -387,7 +387,7 @@ class Common
     {
         $cfgRelation = $this->relation->getRelationsParam();
         if (! $cfgRelation['pdfwork']) {
-            return null;
+            return -1;
         }
 
         $query = "SELECT `page_nr`"
@@ -404,7 +404,7 @@ class Common
             DatabaseInterface::QUERY_STORE
         );
 
-        if (! is_null($default_page_no) && count($default_page_no)) {
+        if (is_array($default_page_no) && isset($default_page_no[0])) {
             return intval($default_page_no[0]);
         }
         return -1;
@@ -422,7 +422,7 @@ class Common
     {
         $cfgRelation = $this->relation->getRelationsParam();
         if (! $cfgRelation['pdfwork']) {
-            return null;
+            return -1;
         }
 
         $page_no = -1;
@@ -443,7 +443,7 @@ class Common
                 DatabaseInterface::CONNECT_CONTROL,
                 DatabaseInterface::QUERY_STORE
             );
-            if (isset($min_page_no[0]) && count($min_page_no[0])) {
+            if (is_array($min_page_no) && isset($min_page_no[0])) {
                 $page_no = $min_page_no[0];
             }
         }