merged master

lib/Models/CustomField.php

@@ -0,0 +1,25 @@
+<?php
+namespace MailPoet\Models;
+
+if(!defined('ABSPATH')) exit;
+
+class CustomField extends Model {
+  public static $_table = MP_CUSTOM_FIELDS_TABLE;
+
+  function __construct() {
+    parent::__construct();
+
+    $this->addValidations('name', array(
+      'required' => __('You need to specify a name.')
+    ));
+  }
+
+  function subscribers() {
+    return $this->has_many_through(
+      __NAMESPACE__ . '\Subscriber',
+      __NAMESPACE__ . '\SubscriberCustomField',
+      'custom_field_id',
+      'subscriber_id'
+    );
+  }
+}

lib/Models/Subscriber.php

@@ -132,6 +132,15 @@ class Subscriber extends Model {
     );
   }
 
+  function customFields() {
+    return $this->has_many_through(
+      __NAMESPACE__.'\CustomField',
+      __NAMESPACE__.'\SubscriberCustomField',
+      'subscriber_id',
+      'custom_field_id'
+    )->select_expr(MP_SUBSCRIBER_CUSTOM_FIELD_TABLE.'.value');
+  }
+
   static function createOrUpdate($data = array()) {
     $subscriber = false;
 

lib/Models/SubscriberCustomField.php

@@ -0,0 +1,12 @@
+<?php
+namespace MailPoet\Models;
+
+if(!defined('ABSPATH')) exit;
+
+class SubscriberCustomField extends Model {
+  public static $_table = MP_SUBSCRIBER_CUSTOM_FIELD_TABLE;
+
+  function __construct() {
+    parent::__construct();
+  }
+}