r2849 - propagate InvalidArgException

diff --git a/inc/database.php b/inc/database.php
index 337c11fddae8a9f6d9c1d2d042680db4bcdfd303..612d2148311db11b1f39b025c35d6b8bbbb789f5 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -265,10 +265,7 @@ function listCells ($realm, $parent_id = 0)
        }
        global $SQLSchema;
        if (!isset ($SQLSchema[$realm]))
-       {
-               showError ('invalid arg', __FUNCTION__);
-               return NULL;
-       }
+               throw new InvalidArgException (__FUNCTION__);
        $SQLinfo = $SQLSchema[$realm];
        $query = 'SELECT tag_id';
        foreach ($SQLinfo['columns'] as $alias => $expression)
@@ -358,10 +355,7 @@ function spotEntity ($realm, $id)
                return $entityCache['partial'][$realm][$id];
        global $SQLSchema;
        if (!isset ($SQLSchema[$realm]))
-       {
-               showError ('invalid arg', __FUNCTION__);
-               return NULL;
-       }
+               throw new InvalidArgException (__FUNCTION__);
        $SQLinfo = $SQLSchema[$realm];
        $query = 'SELECT tag_id';
        foreach ($SQLinfo['columns'] as $alias => $expression)
@@ -3357,8 +3351,8 @@ function getAllUnlinkedFiles ($entity_type = NULL, $entity_id = 0)
 // it conveniently.
 function getFilesOfEntity ($entity_type = NULL, $entity_id = 0)
 {
-       if ($entity_type == NULL || $entity_id <= 0)
-               throw new InvalidArgException();
+       if ($entity_type === NULL || $entity_id <= 0)
+               throw new InvalidArgException (__FUNCTION__);
        global $dbxlink;
        $sql =
                'SELECT FileLink.file_id, FileLink.id AS link_id, name, type, size, ctime, mtime, atime, comment ' .

diff --git a/inc/functions.php b/inc/functions.php
index ded50a4be6d98304646a1c8bb8a8894b9d96e2ef..77aa207c98f60fc37752026b87c7ba7b1702664c 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2008,7 +2008,7 @@ function scanRealmByText ($realm = NULL, $ftext = '')
                }
                return filterCellList (listCells ($realm), $fexpr);
        default:
-               return NULL;
+               throw new InvalidArgException (__FUNCTION__);
        }
 
 }