Merge remote-tracking branch 'upstream/master' into nightly

Conflicts:
	lib/util.php

diff --cc actions/apisearchatom.php
Simple merge

diff --cc classes/Notice.php
Simple merge

diff --cc extlib/DB.php
index b9b5c4a79fdd0462e0a7d0ca4065dd41a42a9364,b9b5c4a79fdd0462e0a7d0ca4065dd41a42a9364..f36f919fe969a2ed481960fb8d31a7ed3ebbfaef
--- 1/extlib/DB.php
--- 2/extlib/DB.php
+++ b/extlib/DB.php
@@@ -964,7 -964,7 +964,7 @@@ class DB_Error extends PEAR_Erro
      {
          if (is_int($code)) {
              $this->PEAR_Error('DB Error: ' . DB::errorMessage($code), $code,
--                              $mode, $level, $debuginfo);
++                              $mode, $level, $debuginfo, common_log(LOG_ERR, var_export($debuginfo,true)));
          } else {
              $this->PEAR_Error("DB Error: $code", DB_ERROR,
                                $mode, $level, $debuginfo);

diff --cc lib/activityhandlerplugin.php
Simple merge

diff --cc lib/noticelistitem.php
Simple merge

diff --cc lib/util.php
index 985b3773df38a4a63e4659339a14f114e3f7af80,a177c92a25091499d4de28b467a6969e08488643..9815916ad19c19b0f21c501980a95640e0a9ac6b
--- 1/lib/util.php
--- 2/lib/util.php
+++ b/lib/util.php
@@@ -581,7 -580,16 +581,20 @@@ function common_canonical_email($email
      return $email;
  }
  
++<<<<<<< HEAD
 +function common_purify($html, array $args=array())
++=======
+ function common_to_alphanumeric($str)
+ {
+     $filtered = preg_replace('/[^A-Za-z0-9]\s*/', '', $str);
+     if (strlen($filtered) < 1) {
+         throw new Exception('Filtered string was zero-length.');
+     }
+     return $filtered;
+ }
+ 
+ function common_purify($html)
++>>>>>>> upstream/master
  {
      require_once INSTALLDIR.'/extlib/HTMLPurifier/HTMLPurifier.auto.php';