diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-07-03 03:08:34 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-07-03 03:08:34 -0400 |
| commit | 00074cda739702d97e07e490cbba6fa0a4fde23b (patch) | |
| tree | 7009aaf167a5130ce4e4e82153c6d48cebf85015 /lib | |
| parent | e8f27025ba7869057d86fe37a5264e1c742969f5 (diff) | |
| parent | f73d93fa7ae79f1e0b47d73fbdc1b214c6e559ae (diff) | |
Merge branch '0.8.x' into queuemanager
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/action.php | 19 | ||||
| -rw-r--r-- | lib/common.php | 3 | ||||
| -rw-r--r-- | lib/rssaction.php | 2 | ||||
| -rw-r--r-- | lib/util.php | 3 |
4 files changed, 16 insertions, 11 deletions
diff --git a/lib/action.php b/lib/action.php index 3bfa6ba15..c89fe180a 100644 --- a/lib/action.php +++ b/lib/action.php @@ -383,15 +383,18 @@ class Action extends HTMLOutputter // lawsuit { $this->elementStart('address', array('id' => 'site_contact', 'class' => 'vcard')); - $this->elementStart('a', array('class' => 'url home bookmark', - 'href' => common_local_url('public'))); - if (common_config('site', 'logo') || file_exists(theme_file('logo.png'))) { - $this->element('img', array('class' => 'logo photo', - 'src' => (common_config('site', 'logo')) ? common_config('site', 'logo') : theme_path('logo.png'), - 'alt' => common_config('site', 'name'))); + if (Event::handle('StartAddressData', array($this))) { + $this->elementStart('a', array('class' => 'url home bookmark', + 'href' => common_local_url('public'))); + if (common_config('site', 'logo') || file_exists(theme_file('logo.png'))) { + $this->element('img', array('class' => 'logo photo', + 'src' => (common_config('site', 'logo')) ? common_config('site', 'logo') : theme_path('logo.png'), + 'alt' => common_config('site', 'name'))); + } + $this->element('span', array('class' => 'fn org'), common_config('site', 'name')); + $this->elementEnd('a'); + Event::handle('EndAddressData', array($this)); } - $this->element('span', array('class' => 'fn org'), common_config('site', 'name')); - $this->elementEnd('a'); $this->elementEnd('address'); } diff --git a/lib/common.php b/lib/common.php index 5d451463b..14be747bc 100644 --- a/lib/common.php +++ b/lib/common.php @@ -124,7 +124,8 @@ $config = 'dupelimit' => 60), # default for same person saying the same thing 'syslog' => array('appname' => 'laconica', # for syslog - 'priority' => 'debug'), # XXX: currently ignored + 'priority' => 'debug', # XXX: currently ignored + 'facility' => LOG_USER), 'queue' => array('enabled' => false, 'subsystem' => 'db', # default to database, or 'stomp' diff --git a/lib/rssaction.php b/lib/rssaction.php index 6f6c9a8cb..0c8188e88 100644 --- a/lib/rssaction.php +++ b/lib/rssaction.php @@ -214,7 +214,7 @@ class Rss10Action extends Action $this->element('cc:licence', array('rdf:resource' => common_config('license', 'url'))); if ($notice->reply_to) { $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to)); - $this->element('sioc:reply_to', array('rdf:resource' => $replyurl)); + $this->element('sioc:reply_of', array('rdf:resource' => $replyurl)); } $this->elementEnd('item'); $this->creators[$creator_uri] = $profile; diff --git a/lib/util.php b/lib/util.php index 86a0316ea..a40cd3d54 100644 --- a/lib/util.php +++ b/lib/util.php @@ -978,7 +978,8 @@ function common_ensure_syslog() { static $initialized = false; if (!$initialized) { - openlog(common_config('syslog', 'appname'), 0, LOG_USER); + openlog(common_config('syslog', 'appname'), 0, + common_config('syslog', 'facility')); $initialized = true; } } |