diff --git a/docs/NEWS b/docs/NEWS index 679b8757..1d7b902e 100644 --- a/docs/NEWS +++ b/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] diff --git a/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php b/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php index bfd321f9..ab37ead6 100644 --- a/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php +++ b/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 = '
diff --git a/plugins/serendipity_event_karma/serendipity_event_karma.php b/plugins/serendipity_event_karma/serendipity_event_karma.php index 217e82f7..7979ffa2 100644 --- a/plugins/serendipity_event_karma/serendipity_event_karma.php +++ b/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', ' - +
' . PLUGIN_KARMA_TAB_APPEARANCE . '
@@ -138,7 +138,7 @@ class serendipity_event_karma extends serendipity_event case 'text_tab': $propbag->add('type', 'content'); $propbag->add('default', ' - +
' . PLUGIN_KARMA_TAB_TEXT . '
@@ -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 diff --git a/plugins/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php b/plugins/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php index 242672e1..ddc8bde9 100644 --- a/plugins/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php +++ b/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'; } ?> - +