eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch '1.0.x' into testing

This commit is contained in:
Evan Prodromou 2011-09-16 15:27:00 -04:00
parent 9f6adb3f52 dcbf2f6871
commit 0573c268d0
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/mail.php
View File

@ -71,18 +71,25 @@ function mail_backend()
*/ */
function mail_send($recipients, $headers, $body) function mail_send($recipients, $headers, $body)
{ {
// XXX: use Mail_Queue... maybe try {
$backend = mail_backend(); // XXX: use Mail_Queue... maybe
if (!isset($headers['Content-Type'])) { $backend = mail_backend();
$headers['Content-Type'] = 'text/plain; charset=UTF-8';
} if (!isset($headers['Content-Type'])) {
assert($backend); // throws an error if it's bad $headers['Content-Type'] = 'text/plain; charset=UTF-8';
$sent = $backend->send($recipients, $headers, $body); }
if (PEAR::isError($sent)) {
common_log(LOG_ERR, 'Email error: ' . $sent->getMessage()); assert($backend); // throws an error if it's bad
$sent = $backend->send($recipients, $headers, $body);
return true;
} catch (PEAR_Exception $e) {
common_log(
LOG_ERR,
"Unable to send email - '{$e->getMessage()}'. "
. 'Is your mail subsystem set up correctly?'
);
return false; return false;
} }
return true;
} }
/** /**

8
lib/urlmapper.php
View File

@ -58,6 +58,7 @@ class URLMapper
protected $statics = array(); protected $statics = array();
protected $variables = array(); protected $variables = array();
protected $reverse = array(); protected $reverse = array();
protected $allpaths = array();
function connect($path, $args, $paramPatterns=array()) function connect($path, $args, $paramPatterns=array())
{ {
@ -65,6 +66,8 @@ class URLMapper
throw new Exception(sprintf("Can't connect %s; path has no action.", $path)); throw new Exception(sprintf("Can't connect %s; path has no action.", $path));
} }
$allpaths[] = $path;
$action = $args[self::ACTION]; $action = $args[self::ACTION];
$paramNames = $this->getParamNames($path); $paramNames = $this->getParamNames($path);
@ -223,6 +226,11 @@ class URLMapper
return $format; return $format;
} }
public function getPaths()
{
return $this->allpaths;
}
} }
class PatternReplacer class PatternReplacer