tauno

diff -ru wpfront-notification-bar/classes/class-wpfront-notification-bar.php wpfront2/classes/class-wpfront-notification-bar.php
--- wpfront-notification-bar/classes/class-wpfront-notification-bar.php	2015-12-12 12:37:48.000000000 -0800
+++ wpfront2/classes/class-wpfront-notification-bar.php	2017-09-01 11:39:02.000000000 -0700
@@ -64,9 +64,10 @@
 
         public function init() {
             //for landing page tracking
-            if (!isset($_COOKIE[self::COOKIE_LANDINGPAGE])) {
-                setcookie(self::COOKIE_LANDINGPAGE, 1);
-            }

tauno

trigger ContactMergeTrigger on Contact (after delete) {
	List<Merged_Contact__c> listMergedContacts = new List<Merged_Contact__c>();
    for(Contact contact : trigger.old) {
        if(String.isNotBlank(contact.MasterRecordId)) { 
            listMergedContacts.add(new Merged_Contact__c(Contact__c = contact.MasterRecordId, Old_Contact__c = contact.id));  
        }         
    }
    if(listMergedContacts.size() > 0) {
        insert listMergedContacts;
    }    

tauno

diff --git a/includes/salesforce.inc b/includes/salesforce.inc
index a329e93..e1bfa33 100644
--- a/includes/salesforce.inc
+++ b/includes/salesforce.inc
@@ -504,6 +504,13 @@ class Salesforce {
     if (isset($params[$key])) {
       unset($params[$key]);
     }
+
+    // External key values with punctuation need to be escaped.

tauno

diff --git a/inc/imce.page.inc b/inc/imce.page.inc
index 5c60d53..1598f8b 100644
--- a/inc/imce.page.inc
+++ b/inc/imce.page.inc
@@ -682,9 +682,19 @@ function imce_validate_quotas($file, &$imce, $add = 0) {
  */
 if (variable_get('imce_image_get_info', 0)) {
   function imce_image_info($file) {
+    if (function_exists('apc_fetch')) {
+      $cache = apc_fetch($file);

tauno

<?php
/**
 * Check if the file is an image and return info.
 */
function imce_image_info($file) {
  if (function_exists('apc_fetch')) {
    $cache = apc_fetch($file);
    if ($cache) {
      return $cache;
    }