summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-07-01 12:58:16 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-07-01 12:58:16 -0400
commit8a8390c1a78a2586bb2e9e10bfcb3502739d8d76 (patch)
treef3a99fb51913df264bef9bb8ccb199ffa2a8fa26
parentf61645aef803d7d39d03fddb25106bb9eae06060 (diff)
exclude p argument when calculating selfUrl
-rw-r--r--lib/action.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/action.php b/lib/action.php
index 89a8c8f4d..6a2f9b0f1 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -247,7 +247,6 @@ class Action extends HTMLOutputter // lawsuit
'src' => common_path('js/jquery.joverlay.min.js')),
' ');
-
Event::handle('EndShowJQueryScripts', array($this));
}
if (Event::handle('StartShowLaconicaScripts', array($this))) {
@@ -964,12 +963,16 @@ class Action extends HTMLOutputter // lawsuit
$action = $this->trimmed('action');
$args = $this->args;
unset($args['action']);
+ if (common_config('site', 'fancy')) {
+ unset($args['p']);
+ }
if (array_key_exists('submit', $args)) {
unset($args['submit']);
}
foreach (array_keys($_COOKIE) as $cookie) {
unset($args[$cookie]);
}
+
return common_local_url($action, $args);
}