From 550f270a0027e67a0eb19d99fbe54d6045696a0b Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 22 Apr 2007 15:27:40 +0000
Subject: #10005, #10003, #10001, #9999, #9945, #9965, #9909, #9906, #9877,
 #9861, #9831, #9830, #9815, #9665, #9624

prosilver adjustments for important announcements in ucp - #9995
MCP fixes for user notes/warnings - #9981
Preserving imageset values on save/edit
find a member link for Mass PM's - #9925
syndicate window.onload events where necessary - #9878
Duplicate topics in forums with announcements - #9840
Email template for forced re-activation - #9808
Topic pagination adjustment - #9763
Changed compose message layout in UCP - #9706, #9702
Fixed inline attachment font size (hopefully)


git-svn-id: file:///svn/phpbb/trunk@7384 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions_module.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'phpBB/includes/functions_module.php')

diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index f2494820ae..86cc93435d 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -464,6 +464,33 @@ class p_master
 		}
 	}
 
+	/**
+	* Appending url parameter to the currently active module.
+	*
+	* This function is called for adding specific url parameters while executing the current module.
+	* It is doing the same as the _module_{name}_url() function, apart from being able to be called after
+	* having dynamically parsed specific parameters. This allows more freedom in choosing additional parameters.
+	* One example can be seen in /includes/mcp/mcp_notes.php - $this->p_master->adjust_url() call.
+	*
+	* @param string $url_extra Extra url parameters, e.g.: &amp;u=$user_id
+	*
+	*/
+	function adjust_url($url_extra)
+	{
+		if (empty($this->module_ary[$this->active_module_row_id]))
+		{
+			return;
+		}
+
+		$row = &$this->module_ary[$this->active_module_row_id];
+
+		// We check for the same url_extra in $row['url_extra'] to overcome doubled additions...
+		if (strpos($row['url_extra'], $url_extra) === false)
+		{
+			$row['url_extra'] .= $url_extra;
+		}
+	}
+
 	/**
 	* Check if a module is active
 	*/
-- 
cgit v1.2.1