]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
exclude p argument when calculating selfUrl
authorEvan Prodromou <evan@controlyourself.ca>
Wed, 1 Jul 2009 16:58:16 +0000 (12:58 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Wed, 1 Jul 2009 16:58:16 +0000 (12:58 -0400)
lib/action.php

index 89a8c8f4d3aa1c5af24440a528f865db5287c6f9..6a2f9b0f19a551c31568f3e98461af170c690563 100644 (file)
@@ -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);
     }