exclude p argument when calculating selfUrl
This commit is contained in:
parent
f61645aef8
commit
8a8390c1a7
|
@ -247,7 +247,6 @@ class Action extends HTMLOutputter // lawsuit
|
||||||
'src' => common_path('js/jquery.joverlay.min.js')),
|
'src' => common_path('js/jquery.joverlay.min.js')),
|
||||||
' ');
|
' ');
|
||||||
|
|
||||||
|
|
||||||
Event::handle('EndShowJQueryScripts', array($this));
|
Event::handle('EndShowJQueryScripts', array($this));
|
||||||
}
|
}
|
||||||
if (Event::handle('StartShowLaconicaScripts', array($this))) {
|
if (Event::handle('StartShowLaconicaScripts', array($this))) {
|
||||||
|
@ -964,12 +963,16 @@ class Action extends HTMLOutputter // lawsuit
|
||||||
$action = $this->trimmed('action');
|
$action = $this->trimmed('action');
|
||||||
$args = $this->args;
|
$args = $this->args;
|
||||||
unset($args['action']);
|
unset($args['action']);
|
||||||
|
if (common_config('site', 'fancy')) {
|
||||||
|
unset($args['p']);
|
||||||
|
}
|
||||||
if (array_key_exists('submit', $args)) {
|
if (array_key_exists('submit', $args)) {
|
||||||
unset($args['submit']);
|
unset($args['submit']);
|
||||||
}
|
}
|
||||||
foreach (array_keys($_COOKIE) as $cookie) {
|
foreach (array_keys($_COOKIE) as $cookie) {
|
||||||
unset($args[$cookie]);
|
unset($args[$cookie]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return common_local_url($action, $args);
|
return common_local_url($action, $args);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user