"Licensing mechanism not active after a new install until the user does an 'Update' of the plugins."

KTC-648 Merge from 3.5.4a. Committed by: Donald Jackson Reviewed by: Kevin Fourie git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@9669 c91229c3-7414-0410-bfa2-8a42b809f60b

"Licensing mechanism not active after a new install until the user does an 'Update' of the plugins."
KTC-648 Merge from 3.5.4a. Committed by: Donald Jackson Reviewed by: Kevin Fourie git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@9669 c91229c3-7414-0410-bfa2-8a42b809f60b
Donald Jackson
1 parent 3f77357b
Showing 3 changed files with 33 additions and 1 deletions
lib/database/dbutil.inc
thirdparty/pear/DB/common.php
thirdparty/pear/DB/mysql.php
@@ -168,7 +168,7 @@ class DBUtil {
             if ($bNoId)
                 return;
             else
-                return mysql_insert_id();
+                return $db->getLastId();
         }
         if (PEAR::isError($res)) {
         	DBUtil::logQueryError(DBUtil::lastQuery($db), $res);
@@ -2030,6 +2030,22 @@ class DB_common extends PEAR
     }
  
     // }}}
+    
+    // {{{ getLastId()
+
+    /**
+     * Returns the last insert ID
+     *
+     * @return int
+     *
+     * @access public
+     */
+    function getLastId()
+    {
+        return $this->_getLastId();
+    }
+
+    // }}}
 }
  
 /*
@@ -904,6 +904,22 @@ class DB_mysql extends DB_common
  
     // }}}
  
+	// {{{ _getLastId()
+
+	/**
+     * Returns the last insert ID
+     *
+     * @return int
+     *
+     * @access private
+     */
+	function _getLastId()
+	{
+		return mysql_insert_id($this->connection);
+	}
+
+	// }}}
+
 }
  
 /*