| @@ -45,34 +45,24 @@ | ||
| 45 | 45 | * @return array |
| 46 | 46 | */ |
| 47 | 47 | $record = apply_filters( 'wp_stream_record_array', $record ); |
| 48 | 48 | |
| 49 | - array_walk( $record, function( &$value, &$key ) { | |
| 50 | - if ( ! is_array( $value ) ) { | |
| 51 | - $value = strip_tags( $value ); | |
| 49 | + array_walk( | |
| 50 | + $record, | |
| 51 | + function( &$value, &$key ) { | |
| 52 | + if ( ! is_array( $value ) ) { | |
| 53 | + $value = strip_tags( $value ); | |
| 54 | + } | |
| 52 | 55 | } |
| 53 | - }); | |
| 56 | + ); | |
| 54 | 57 | |
| 55 | 58 | if ( empty( $record ) ) { |
| 56 | 59 | return false; |
| 57 | 60 | } |
| 58 | 61 | |
| 59 | - $fields = array( 'object_id', 'site_id', 'blog_id', 'user_id', 'user_role', 'created', 'summary', 'ip', 'connector', 'context', 'action' ); | |
| 62 | + $fields = array( 'object_id', 'site_id', 'blog_id', 'user_id', 'user_role', 'created', 'summary', 'ip', 'connector', 'context', 'action', 'meta' ); | |
| 60 | 63 | $data = array_intersect_key( $record, array_flip( $fields ) ); |
| 61 | 64 | |
| 62 | - $meta = array(); | |
| 63 | - foreach ( (array) $record['meta'] as $key => $vals ) { | |
| 64 | - // If associative array, serialize it, otherwise loop on its members | |
| 65 | - $vals = ( is_array( $vals ) && 0 !== key( $vals ) ) ? array( $vals ) : $vals; | |
| 66 | - | |
| 67 | - foreach ( (array) $vals as $num => $val ) { | |
| 68 | - $vals[ $num ] = maybe_serialize( $val ); | |
| 69 | - } | |
| 70 | - $meta[ $key ] = $vals; | |
| 71 | - } | |
| 72 | - | |
| 73 | - $data['meta'] = $meta; | |
| 74 | - | |
| 75 | 65 | $record_id = $this->driver->insert_record( $data ); |
| 76 | 66 | |
| 77 | 67 | if ( ! $record_id ) { |
| 78 | 68 | /** |
| @@ -209,9 +199,9 @@ | ||
| 209 | 199 | * @return array Array of query arguments |
| 210 | 200 | */ |
| 211 | 201 | $args = apply_filters( 'wp_stream_query_args', $args ); |
| 212 | 202 | |
| 213 | - $result = (array) $this->driver->get_records( $args ); | |
| 203 | + $result = (array) $this->driver->get_records( $args ); | |
| 214 | 204 | $this->found_records_count = isset( $result['count'] ) ? $result['count'] : 0; |
| 215 | 205 | |
| 216 | 206 | return empty( $result['items'] ) ? array() : $result['items']; |
| 217 | 207 | } |