Merge pull request #4903 from MrPetovan/bug/infinite-loop-in-dba-delete

Add documentation for new $options parameter in dba::delete

diff --git a/include/dba.php b/include/dba.php
index b41a7aab76bfd00a265196ff88916b4bb095b8dd..bac61ec2f519160d06d026e84d485abc94d0811d 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -858,6 +858,9 @@ class dba {
         *
         * @param string  $table       Table name
         * @param array   $conditions  Field condition(s)
+        * @param array   $options
+        *                - cascade: If true we delete records in other tables that depend on the one we're deleting through
+        *                           relations (default: true)
         * @param boolean $in_process  Internal use: Only do a commit after the last delete
         * @param array   $callstack   Internal use: prevent endless loops
         *