Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-03-23-44-14

Conflicts:
	CRM/Profile/Page/Dynamic.php

diff --cc CRM/Core/Error.php
Simple merge

diff --cc CRM/Mailing/Form/Test.php
index ba492fffb22f08c6c1cab4407045f5284be618f9,0f953363e85e6281a468a5bc9d03851df6a80c3b..873725eb0ce9f89165c65b568ec6080f7a2e0ebb
--- 1/CRM/Mailing/Form/Test.php
--- 2/CRM/Mailing/Form/Test.php
+++ b/CRM/Mailing/Form/Test.php
@@@ -214,9 -214,9 +214,9 @@@ class CRM_Mailing_Form_Test extends CRM
          foreach ($emailAdd as $key => $value) {
            $email = trim($value);
            $testParams['emails'][] = $email;
-           $emails .= $emails ? ",'$email'" : "'$email'";
+           $emails .= ($emails ? ',' : '') . "'" . CRM_Core_DAO::escapeString($email)  . "'";
            if (!CRM_Utils_Rule::email($email)) {
 -            CRM_Core_Session::setStatus(ts('Please enter a valid email addresses.'), ts('Test not sent.'), 'error');
 +            CRM_Core_Session::setStatus(ts('Please enter a valid email address.'), ts('Test not sent.'), 'error');
              $error = TRUE;
            }
          }

diff --cc CRM/PCP/BAO/PCP.php
Simple merge

diff --cc CRM/Profile/Page/Dynamic.php
Simple merge

diff --cc CRM/Utils/System/DrupalBase.php
index b831dc509220a4e11b05b626563d354f86604b36,a881144a69ec84bb3233467d7f92b759a8d1338e..3f98dbde475e5bd56ae4d4de490889c26fa9877b
--- 1/CRM/Utils/System/DrupalBase.php
--- 2/CRM/Utils/System/DrupalBase.php
+++ b/CRM/Utils/System/DrupalBase.php
@@@ -258,18 -265,22 +258,18 @@@ abstract class CRM_Utils_System_DrupalB
    }
  
    /**
 -   * Is the current user permitted to add a user
 -   * @return bool
 +   * @inheritDoc
     */
 -  function checkPermissionAddUser() {
 -    if (CRM_Core_Permission::check('administer users')) {
 -      return TRUE;
 -    }
 +  public function checkPermissionAddUser() {
 +    return CRM_Core_Permission::check('administer users');
    }
  
 -
    /**
 -   * Log error to CMS
 +   * @inheritDoc
     */
 -  function logger($message) {
 +  public function logger($message) {
      if (CRM_Core_Config::singleton()->userFrameworkLogging) {
-       watchdog('civicrm', $message, NULL, WATCHDOG_DEBUG);
+       watchdog('civicrm', '%message', array('%message' => $message), NULL, WATCHDOG_DEBUG);
      }
    }