diff options
| -rw-r--r-- | lib/action.php | 5 | ||||
| -rw-r--r-- | lib/util.php | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/action.php b/lib/action.php index 12d122f12..3bfa6ba15 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))) { @@ -966,12 +965,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); } diff --git a/lib/util.php b/lib/util.php index 272104581..461ca15c1 100644 --- a/lib/util.php +++ b/lib/util.php @@ -145,7 +145,6 @@ function common_ensure_session() } if (!common_have_session()) { if (common_config('sessions', 'handle')) { - common_log(LOG_INFO, "Using our own session handler"); Session::setSaveHandler(); } @session_start(); |