One more underscore to make it more readable

[mailer.git] / inc / mysql-manager.php

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index d42cd4ecdce94b2af26066db9c3c08e7d7989076..394189cc9f9876e29183068fcd48c12cce0f90f4 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -843,6 +843,8 @@ function getActionFromModuleWhat ($module, $what) {
                                $module,
                                $what
                        ), __FUNCTION__, __LINE__);
+
+               // Entry found?
                if (SQL_NUMROWS($result) == 1) {
                        // Load action value and pray that this one is the right you want... ;-)
                        $data = SQL_FETCHARRAY($result);
@@ -1891,7 +1893,7 @@ function createNewTask ($subject, $notes, $taskType, $userid = NULL, $adminId =
                ), __FUNCTION__, __LINE__, TRUE, $strip);
 
        // Return insert id which is the task id
-       return SQL_INSERTID();
+       return SQL_INSERT_ID();
 }
 
 // Updates last module / online time
@@ -2128,14 +2130,14 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
                SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
                // Add id number
-               setPostRequestElement('id', SQL_INSERTID());
+               setPostRequestElement('id', SQL_INSERT_ID());
 
                // Prepare filter data array
                $filterData = array(
                        'mode'          => 'add',
                        'table_name'    => $tableName,
                        'content'       => postRequestArray(),
-                       'id'            => SQL_INSERTID(),
+                       'id'            => SQL_INSERT_ID(),
                        'subject'       => '',
                        // @TODO Used generic 'userid' here
                        'userid_column' => array('userid'),
@@ -2281,11 +2283,8 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
                                continue;
                        } // END - if
 
-                       // Is the cache file loadable?
-                       if ($GLOBALS['cache_instance']->loadCacheFile($cache)) {
-                               // Then remove it
-                               $GLOBALS['cache_instance']->removeCacheFile();
-                       } // END - if
+                       // Use rebuildCache() to delete it
+                       rebuildCache($cache);
                } // END - foreach
        } // END - if