From fd12ba4b8e047219ec5c75dadf8831c27d062b82 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 12 Nov 2013 14:59:01 +0100
Subject: [PATCH] [feature/module_services] Fix minor issues in portal_poll

---
 portal/modules/portal_poll.php                         | 10 ++++------
 .../prosilver/template/portal/modules/poll_side.html   |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/portal/modules/portal_poll.php b/portal/modules/portal_poll.php
index 4466cf1a..2ee75102 100644
--- a/portal/modules/portal_poll.php
+++ b/portal/modules/portal_poll.php
@@ -214,10 +214,10 @@ class portal_poll_module extends \board3\portal\modules\module_base
 
 			if($s_can_up_vote)
 			{
+				$redirect_url = append_sid("{$phpbb_root_path}app.$phpEx/portal");
+
 				if (!sizeof($voted_id) || sizeof($voted_id) > $topic_data['poll_max_options'] || in_array(VOTE_CONVERTED, $cur_voted_id))
 				{
-					$redirect_url = append_sid("{$phpbb_root_path}portal.$phpEx");
-
 					meta_refresh(5, $redirect_url);
 					if (!sizeof($voted_id))
 					{
@@ -295,8 +295,6 @@ class portal_poll_module extends \board3\portal\modules\module_base
 				//, topic_last_post_time = ' . time() . " -- for bumping topics with new votes, ignore for now
 				$db->sql_query($sql);
 
-				$redirect_url = append_sid("{$phpbb_root_path}portal.$phpEx");
-
 				meta_refresh(5, $redirect_url);
 				trigger_error($user->lang['VOTE_SUBMITTED'] . '<br /><br />' . sprintf($user->lang['RETURN_PORTAL'], '<a href="' . $redirect_url . '">', '</a>'));
 			}
@@ -437,8 +435,8 @@ class portal_poll_module extends \board3\portal\modules\module_base
 					}
 
 					$poll_view_str = urlencode(implode(',', $make_poll_view));
-					$portalpoll_url= append_sid("{$phpbb_root_path}portal.$phpEx", "polls=$poll_view_str");
-					$portalvote_url= append_sid("{$phpbb_root_path}portal.$phpEx", "f=$forum_id&amp;t=$topic_id");
+					$portalpoll_url= append_sid("{$phpbb_root_path}app.$phpEx/portal", "polls=$poll_view_str");
+					$portalvote_url= append_sid("{$phpbb_root_path}app.$phpEx/portal", "f=$forum_id&amp;t=$topic_id");
 					$viewtopic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=$topic_id");
 					$poll_end = $data['poll_length'] + $data['poll_start'];
 
diff --git a/styles/prosilver/template/portal/modules/poll_side.html b/styles/prosilver/template/portal/modules/poll_side.html
index 5bcb6ee8..cdc37f37 100644
--- a/styles/prosilver/template/portal/modules/poll_side.html
+++ b/styles/prosilver/template/portal/modules/poll_side.html
@@ -46,7 +46,7 @@
 				</div>
 				<!-- IF poll_side.S_CAN_VOTE -->{poll_side.S_HIDDEN_FIELDS}<!-- ENDIF -->
 			<!-- IF poll_side.S_CAN_VOTE --></form><!-- ENDIF -->
-		<!-- END poll -->
+		<!-- END poll_side -->
 		</div>
 	<!-- ELSE -->
 	<div class="panel bg1" style="margin-bottom: 0px">
@@ -55,4 +55,4 @@
 		<span class="portal-corners-bottom-inner"></span></div>
 	</div>
 	<!-- ENDIF -->
-{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
\ No newline at end of file
+{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}