From 6d0d05614e0c1bcd5259feb84eddbf9d03770284 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 17 Oct 2016 17:33:38 -0400
Subject: [PATCH 1/7] CRM-19510 - Fix multibyte trim breakage in news widget

---
 templates/CRM/Dashlet/Page/Blog.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/CRM/Dashlet/Page/Blog.tpl b/templates/CRM/Dashlet/Page/Blog.tpl
index 3b90a2ccb149..6d4f8a93c8b6 100644
--- a/templates/CRM/Dashlet/Page/Blog.tpl
+++ b/templates/CRM/Dashlet/Page/Blog.tpl
@@ -61,7 +61,7 @@
       <div class="crm-accordion-wrapper collapsed">
         <div class="crm-accordion-header">
           <span class="crm-news-feed-item-title">{$article.title}</span>
-          <span class="crm-news-feed-item-preview"> - {$article.description|strip_tags|substr:0:100}…</span>
+          <span class="crm-news-feed-item-preview"> - {$article.description|strip_tags|ltrim|mb_substr:0:100}…</span>
         </div>
         <div class="crm-accordion-body">
           <div>{$article.description}</div>

From 28288426d6db95be9cb065ade606fc7accfa6af3 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 17 Oct 2016 18:29:49 -0400
Subject: [PATCH 2/7] Check for required mbstring extension

---
 CRM/Utils/Check/Component/Env.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/CRM/Utils/Check/Component/Env.php b/CRM/Utils/Check/Component/Env.php
index 2a370562eba0..f2b9bc977348 100644
--- a/CRM/Utils/Check/Component/Env.php
+++ b/CRM/Utils/Check/Component/Env.php
@@ -698,4 +698,23 @@ public function checkDbEngine() {
     return $messages;
   }
 
+  /**
+   * Check for required mbstring extension
+   * @return array
+   */
+  public function checkMbstring() {
+    $messages = array();
+
+    if (!function_exists('mb_substr')) {
+      $messages[] = new CRM_Utils_Check_Message(
+        __FUNCTION__,
+        ts('The required PHP Multibyte String extension is not enabled on your server. Ask your system administrator to install it.'),
+        ts('Missing mbstring Extension'),
+        \Psr\Log\LogLevel::ERROR,
+        'fa-server'
+      );
+    }
+    return $messages;
+  }
+
 }

From 9e2a3a0f22a585411c718b80958b137aaaeef0a8 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 17 Oct 2016 19:32:26 -0400
Subject: [PATCH 3/7] Fix api explorer getfields options

---
 templates/CRM/Admin/Page/APIExplorer.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/CRM/Admin/Page/APIExplorer.js b/templates/CRM/Admin/Page/APIExplorer.js
index 1360611a4996..2d42363d9cc6 100644
--- a/templates/CRM/Admin/Page/APIExplorer.js
+++ b/templates/CRM/Admin/Page/APIExplorer.js
@@ -267,6 +267,7 @@
           return ret;
         }, {})
       };
+      getFieldsCache[entity+action] = {values: _.cloneDeep(getFieldData)};
       showFields(['api_action']);
       renderJoinSelector();
       return;

From ade9995eeaa5ab7a9c9e2c5a333cdfb4f5403aea Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 17 Oct 2016 19:55:54 -0400
Subject: [PATCH 4/7] Downgrade mbstring to warning, make usage conditional

---
 CRM/Utils/Check/Component/Env.php   | 4 ++--
 templates/CRM/Dashlet/Page/Blog.tpl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CRM/Utils/Check/Component/Env.php b/CRM/Utils/Check/Component/Env.php
index f2b9bc977348..6a96017204c5 100644
--- a/CRM/Utils/Check/Component/Env.php
+++ b/CRM/Utils/Check/Component/Env.php
@@ -708,9 +708,9 @@ public function checkMbstring() {
     if (!function_exists('mb_substr')) {
       $messages[] = new CRM_Utils_Check_Message(
         __FUNCTION__,
-        ts('The required PHP Multibyte String extension is not enabled on your server. Ask your system administrator to install it.'),
+        ts('The PHP Multibyte String extension is needed for CiviCRM to correctly handle user input among other functionality. Ask your system administrator to install it.'),
         ts('Missing mbstring Extension'),
-        \Psr\Log\LogLevel::ERROR,
+        \Psr\Log\LogLevel::WARNING,
         'fa-server'
       );
     }
diff --git a/templates/CRM/Dashlet/Page/Blog.tpl b/templates/CRM/Dashlet/Page/Blog.tpl
index 6d4f8a93c8b6..eee9b94da56d 100644
--- a/templates/CRM/Dashlet/Page/Blog.tpl
+++ b/templates/CRM/Dashlet/Page/Blog.tpl
@@ -61,7 +61,7 @@
       <div class="crm-accordion-wrapper collapsed">
         <div class="crm-accordion-header">
           <span class="crm-news-feed-item-title">{$article.title}</span>
-          <span class="crm-news-feed-item-preview"> - {$article.description|strip_tags|ltrim|mb_substr:0:100}…</span>
+          <span class="crm-news-feed-item-preview"> - {if function_exists('mb_substr')}{$article.description|strip_tags|mb_substr:0:100}{else}{$article.description|strip_tags}{/if}</span>
         </div>
         <div class="crm-accordion-body">
           <div>{$article.description}</div>

From 0c12c90fdaf241bd8c52ee2ca1f849f6c0c86f15 Mon Sep 17 00:00:00 2001
From: "deb.monish" <monish.deb@webaccessglobal.com>
Date: Tue, 18 Oct 2016 11:18:16 +0530
Subject: [PATCH 5/7] CRM-16352: 4.7.13 Upgrade miss

---
 CRM/Upgrade/Incremental/sql/4.7.13.mysql.tpl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CRM/Upgrade/Incremental/sql/4.7.13.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.13.mysql.tpl
index 99ee850bc9da..0dca1523bb22 100644
--- a/CRM/Upgrade/Incremental/sql/4.7.13.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.13.mysql.tpl
@@ -19,3 +19,6 @@ WHERE `name` = 'New Tag';
 UPDATE civicrm_navigation SET
   `url` = 'civicrm/admin/tag?reset=1'
 WHERE `name` = 'Tags (Categories)';
+
+-- CRM-16352: Add language filter support for mass mailing
+ALTER TABLE civicrm_mailing ADD COLUMN `language` varchar(5) DEFAULT NULL COMMENT 'Language of the content of the mailing. Useful for tokens.';

From f826e3eb524a706fa9b8438ac4ace73b3c245dd1 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 14 Oct 2016 23:06:22 -0400
Subject: [PATCH 6/7] CRM-19506 - Add caseContact test

---
 tests/phpunit/api/v3/CaseContactTest.php | 46 ++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 tests/phpunit/api/v3/CaseContactTest.php

diff --git a/tests/phpunit/api/v3/CaseContactTest.php b/tests/phpunit/api/v3/CaseContactTest.php
new file mode 100644
index 000000000000..6e8782699e9a
--- /dev/null
+++ b/tests/phpunit/api/v3/CaseContactTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ *  Test APIv3 civicrm_case_* functions
+ *
+ * @package CiviCRM_APIv3
+ * @group headless
+ */
+class api_v3_CaseContactTest extends CiviCaseTestCase {
+  protected $_params;
+  protected $_entity;
+  protected $_cid;
+  /**
+   * Activity ID of created case.
+   *
+   * @var int
+   */
+  protected $_caseActivityId;
+
+  /**
+   * Test setup for every test.
+   *
+   * Connect to the database, truncate the tables that will be used
+   * and redirect stdin to a temporary file.
+   */
+  public function setUp() {
+    $this->_entity = 'case';
+
+    parent::setUp();
+
+    $this->_cid = $this->individualCreate();
+
+    $this->_case = $this->callAPISuccess('case', 'create', array(
+      'case_type_id' => $this->caseTypeId,
+      'subject' => __CLASS__,
+      'contact_id' => $this->_cid,
+    ));
+  }
+
+  public function testCaseContactGet() {
+    $result = $this->callAPIAndDocument('CaseContact', 'get', array(
+      'contact_id' => $this->_cid,
+    ), __FUNCTION__, __FILE__);
+    $this->assertEquals($this->_case['id'], $result['id']);
+  }
+
+}

From 7b9c2f3e6125ffe082012c0dfd40c54e6c92d64d Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 25 Oct 2016 13:26:14 -0400
Subject: [PATCH 7/7] CRM-19506 - Remove conflicting uniqueName from
 CaseContact DAO

This uniqueName did not seem to serve any purpose, and was ambiguous,
easily confused with the "id" column.
---
 CRM/Case/DAO/CaseContact.php        | 4 ++--
 CRM/Core/DAO/AllCoreTables.data.php | 2 +-
 xml/schema/Case/CaseContact.xml     | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CRM/Case/DAO/CaseContact.php b/CRM/Case/DAO/CaseContact.php
index ff1ef5f5e231..19b5cee7d52e 100644
--- a/CRM/Case/DAO/CaseContact.php
+++ b/CRM/Case/DAO/CaseContact.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Case/CaseContact.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:52a6a7dd974e88c088097761faa8ead7)
+ * (GenCodeChecksum:81a99f6c6d9abe6d08efd359c015036c)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
@@ -113,7 +113,7 @@ static function &fields() {
           'required' => true,
           'FKClassName' => 'CRM_Case_DAO_Case',
         ) ,
-        'case_contact_id' => array(
+        'contact_id' => array(
           'name' => 'contact_id',
           'type' => CRM_Utils_Type::T_INT,
           'title' => ts('Contact ID') ,
diff --git a/CRM/Core/DAO/AllCoreTables.data.php b/CRM/Core/DAO/AllCoreTables.data.php
index 27b381f596e8..0dbf28032f97 100644
--- a/CRM/Core/DAO/AllCoreTables.data.php
+++ b/CRM/Core/DAO/AllCoreTables.data.php
@@ -24,7 +24,7 @@
 | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
 +--------------------------------------------------------------------+
 */
-// (GenCodeChecksum:01f161241dcb8f3cbe924b68f5a42a9d)
+// (GenCodeChecksum:89f332e5e88581181224fac51b45a1a4)
 return array(
   'CRM_Core_DAO_AddressFormat' => array(
     'name' => 'AddressFormat',
diff --git a/xml/schema/Case/CaseContact.xml b/xml/schema/Case/CaseContact.xml
index 738e23c25306..7364efd9ed9f 100644
--- a/xml/schema/Case/CaseContact.xml
+++ b/xml/schema/Case/CaseContact.xml
@@ -37,7 +37,6 @@
     <name>contact_id</name>
     <title>Contact ID</title>
     <type>int unsigned</type>
-    <uniqueName>case_contact_id</uniqueName>
     <required>true</required>
     <comment>Contact ID of contact record given case belongs to.</comment>
     <html>