* Adjust getting the right URL for karmavoting and shoutbox

plugins [1.4-beta2]
    * Adjust getting the right URL for karmavoting and shoutbox
      plugins [1.4-beta2]

docs/NEWS

@@ -3,6 +3,9 @@
 Version 1.4 ()
 ------------------------------------------------------------------------
 
+    * Adjust getting the right URL for karmavoting and shoutbox
+      plugins [1.4-beta2]
+
     * Added %parentname% permalink property to category structure,
       so that a full category name path can be used instead of only
       %name%. (garvinhicking) [1.4-beta2]

plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php

@@ -249,7 +249,7 @@ class serendipity_event_entryproperties extends serendipity_event
 
     function showPasswordform() {
         global $serendipity;
-        $url = serendipity_currentURL();
+        $url = serendipity_currentURL(true);
 
         $out = '
         <form action="'.$url.'" method="post" id="entrypasswordform">

plugins/serendipity_event_karma/serendipity_event_karma.php

@@ -13,7 +13,7 @@ if (file_exists($probelang)) {
 
 include dirname(__FILE__) . '/lang_en.inc.php';
 
-@define('PLUGIN_KARMA_DB_VERSION', '2.0');
+@define('PLUGIN_KARMA_DB_VERSION', '2.01');
 
 class serendipity_event_karma extends serendipity_event
 {
@@ -129,7 +129,7 @@ class serendipity_event_karma extends serendipity_event
             case 'appearance_tab':
                 $propbag->add('type', 'content');
                 $propbag->add('default', '
-    <input class="serendipityPrettyButton input_button" type="submit" value="Save" name="SAVECONF" />
+    <input class="serendipityPrettyButton input_button" type="submit" value="' . SAVE . '" name="SAVECONF" />
 </div>
 <div class="serendipity_karmaVoting_appearancetab" style="text-align: center;"><a name="karmaVoting_appearance"></a>
 <span style="font-size: 10pt; font-weight: bold;">' . PLUGIN_KARMA_TAB_APPEARANCE . '<hr style="width: 80%" />
@@ -138,7 +138,7 @@ class serendipity_event_karma extends serendipity_event
             case 'text_tab':
                 $propbag->add('type', 'content');
                 $propbag->add('default', '
-    <input class="serendipityPrettyButton input_button" type="submit" value="Save" name="SAVECONF" />
+    <input class="serendipityPrettyButton input_button" type="submit" value="' . SAVE . '" name="SAVECONF" />
 </div>
 <div class="serendipity_karmaVoting_texttab" style="text-align: center;"><a name="karmaVoting_text"></a> 
 <span style="font-size: 10pt; font-weight: bold;">' . PLUGIN_KARMA_TAB_TEXT . '<hr style="width: 80%" />
@@ -1058,7 +1058,8 @@ END_IMG_CSS;
 
                             //--TODO: Ensure that this works with the Custom Permalinks plugin
                             // (We've seen trouble; it votes correctly, but redirects to the front page)
-                            $url = serendipity_currentURL();
+                            $url = serendipity_currentURL(true);
+                            
                             // Voting is only allowed on entries.  Therefore voting URLs must be
                             // either single-entry URLs or summary URLs.  serendipity_currentURL
                             // converts them to an "ErrorDocument-URI", so we can focus on the

plugins/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php

@@ -141,7 +141,7 @@ class serendipity_plugin_shoutbox extends serendipity_plugin
             $dateformat = '%a, %d.%m.%Y %H:%M';
         }
        ?>
-       <form action="<?php echo serendipity_currentURL(); ?>" method="post">
+       <form action="<?php echo serendipity_currentURL(true); ?>" method="post">
            <input type="hidden" name="action" value="fillshoutbox" />
            <textarea name="serendipity[shouttext]" rows="4" cols="15" style="width: 90%"></textarea>
            <input name='submit' type='submit' value='<?php echo PLUGIN_SHOUTBOX_SUBMIT; ?>' />