summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-01-23 06:47:43 +0100
committerEvan Prodromou <evan@controlyourself.ca>2009-01-23 06:47:43 +0100
commit277a6e984c6778865a62b5a1b99219327460be6d (patch)
tree201ab5a5bf02afe89ef7472f89ffd3d6fcc11ed2 /lib
parent9dc5d8d0f6db1249a62162877c81d240fcf32a0a (diff)
parentdf25b5f5f533a768532263786c73e4b1356da6fd (diff)
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
Diffstat (limited to 'lib')
-rw-r--r--lib/facebookaction.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index 528b58154..a20e618d3 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -73,9 +73,7 @@ class FacebookAction extends Action
function prepare($argarray)
{
parent::prepare($argarray);
-
- common_debug("Facebookaction::prepare");
-
+
$this->facebook = getFacebook();
$this->fbuid = $this->facebook->require_login();
@@ -261,7 +259,6 @@ class FacebookAction extends Action
function showInstructions()
{
- global $xw;
$this->elementStart('dl', array('class' => 'system_notice'));
$this->element('dt', null, 'Page Notice');