extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

docu update and fixed so_sql_cf::delete($keys,true) to always return array

Browse Source
This commit is contained in:
Ralf Becker 2009-09-16 10:20:34 +00:00
parent 317b956d32
commit ad5d2c3941
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etemplate/inc/class.so_sql.inc.php
View File

@ -656,9 +656,9 @@ class so_sql
/** /**
* deletes row representing keys in internal data or the supplied $keys if != null * deletes row representing keys in internal data or the supplied $keys if != null
* *
* @param array $keys=null if given array with col => value pairs to characterise the rows to delete * @param array|int $keys=null if given array with col => value pairs to characterise the rows to delete, or integer autoinc id
* @param boolean $only_return_query=false return $query of delete call to db object, but not run it (used by so_sql_cf!) * @param boolean $only_return_query=false return $query of delete call to db object, but not run it (used by so_sql_cf!)
* @return int affected rows, should be 1 if ok, 0 if an error * @return int|array affected rows, should be 1 if ok, 0 if an error or array with id's if $only_return_ids
*/ */
function delete($keys=null,$only_return_query=false) function delete($keys=null,$only_return_query=false)
{ {

6
etemplate/inc/class.so_sql_cf.inc.php
View File

@ -312,9 +312,9 @@ class so_sql_cf extends so_sql
* *
* reimplented to also delete the custom fields * reimplented to also delete the custom fields
* *
* @param array $keys if given array with col => value pairs to characterise the rows to delete * @param array|int $keys=null if given array with col => value pairs to characterise the rows to delete, or integer autoinc id
* @param boolean $only_return_ids=false return $ids of delete call to db object, but not run it (can be used by extending classes!) * @param boolean $only_return_ids=false return $ids of delete call to db object, but not run it (can be used by extending classes!)
* @return int affected rows, should be 1 if ok, 0 if an error * @return int|array affected rows, should be 1 if ok, 0 if an error or array with id's if $only_return_ids
*/ */
function delete($keys=null,$only_return_ids=false) function delete($keys=null,$only_return_ids=false)
{ {
@ -332,7 +332,7 @@ class so_sql_cf extends so_sql
} }
else else
{ {
$ids = $query[$this->autoinc_id]; $ids = (array)$query[$this->autoinc_id];
} }
if ($only_return_ids) return $ids; if ($only_return_ids) return $ids;
$this->db->delete($this->extra_table,array($this->extra_id => $ids),__LINE__,__FILE__); $this->db->delete($this->extra_table,array($this->extra_id => $ids),__LINE__,__FILE__);