[Fmsystem-commits] [16051] datatype json

[sigurdne]

Revision: 16051
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16051
Author:   sigurdne
Date:     2016-12-06 14:54:00 +0000 (Tue, 06 Dec 2016)
Log Message:
-----------
datatype json

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.socommon.inc.php

Modified: trunk/phpgwapi/inc/class.socommon.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.socommon.inc.php   2016-12-06 14:53:15 UTC (rev 
16050)
+++ trunk/phpgwapi/inc/class.socommon.inc.php   2016-12-06 14:54:00 UTC (rev 
16051)
@@ -112,6 +112,10 @@
                        {
                                return $this->db->db_addslashes($value);
                        }
+                       else if ($type == 'jsonb')
+                       {
+                               return "'" . json_encode($value) . "'";
+                       }
                        return "'" . $this->db->db_addslashes($value) . "'";
                }
 
@@ -569,7 +573,7 @@
                                        && empty($field_info['related'])
                                        && empty($field_info['manytomany']))
                                {
-                                       if($field_info['type'] == 'jsonb')
+                                       if($field_info['type'] == 'json')
                                        {
                                                $value_set[$field] = 
json_encode($object->$field);
                                        }
@@ -627,7 +631,7 @@
                                        && empty($field_info['related'])
                                        && empty($field_info['manytomany']))
                                {
-                                       if($field_info['type'] == 'jsonb')
+                                       if($field_info['type'] == 'json')
                                        {
                                                $value_set[$field] = 
json_encode($object->$field);
                                        }