summaryrefslogtreecommitdiff
path: root/plugins/Facebook
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2010-02-17 12:03:14 -0500
committerCraig Andrews <candrews@integralblue.com>2010-02-17 12:03:14 -0500
commit46e9aa13aa87955b441bc63b7cf2f58622b131b0 (patch)
treef57c2927d3ecfe415bac335cbed243bc61face06 /plugins/Facebook
parentc19300272f0074359b2713c35d2fb46bbd1b42ec (diff)
htmloutputter->script() special cases src's that begin with plugin/ or local/ so that plugins don't need to include common_path() in every call to $action->script()
Adjust plugins to not call common_path() when it's not necessary Fix minify plugin
Diffstat (limited to 'plugins/Facebook')
-rw-r--r--plugins/Facebook/FacebookPlugin.php2
-rw-r--r--plugins/Facebook/facebookaction.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php
index 4266b886d..78c9054e1 100644
--- a/plugins/Facebook/FacebookPlugin.php
+++ b/plugins/Facebook/FacebookPlugin.php
@@ -181,7 +181,7 @@ class FacebookPlugin extends Plugin
if ($this->reqFbScripts($action)) {
$apikey = common_config('facebook', 'apikey');
- $plugin_path = common_path('plugins/Facebook');
+ $plugin_path = 'plugins/Facebook';
$login_url = common_local_url('FBConnectAuth');
$logout_url = common_local_url('logout');
diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php
index 8437a705a..f65b97c86 100644
--- a/plugins/Facebook/facebookaction.php
+++ b/plugins/Facebook/facebookaction.php
@@ -89,7 +89,7 @@ class FacebookAction extends Action
function showScripts()
{
- $this->script(common_path('plugins/Facebook/facebookapp.js'));
+ $this->script('plugins/Facebook/facebookapp.js');
}
/**