[Fmsystem-commits] [15041] Syncromind: Merge 14936:15027 from trunk

[sigurdne]

Revision: 15041
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15041
Author:   sigurdne
Date:     2016-05-13 12:04:49 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Syncromind: Merge 14936:15027 from trunk

Modified Paths:
--------------
    branches/dev-syncromind-2/booking/inc/class.socommon.inc.php

Modified: branches/dev-syncromind-2/booking/inc/class.socommon.inc.php
===================================================================
--- branches/dev-syncromind-2/booking/inc/class.socommon.inc.php        
2016-05-13 12:04:46 UTC (rev 15040)
+++ branches/dev-syncromind-2/booking/inc/class.socommon.inc.php        
2016-05-13 12:04:49 UTC (rev 15041)
@@ -289,6 +289,7 @@
 
                function read_single( $id )
                {
+                       $row = array();
                        $pk_params = $this->primary_key_conditions($id);
                        $cols_joins = $this->_get_cols_and_joins();
                        $cols = join(',', $cols_joins[0]);
@@ -357,8 +358,8 @@
                                                $row[$field] = 
$this->_unmarshal($this->db->f($field, false), $params['type']);
                                        }
                                }
-                               return $row;
                        }
+                       return $row;
                }
 
                function _get_conditions( $query, $filters )