Fix merge conflicts

1 files changed, 33 insertions, 22 deletions

diff --git a/server_status_monitor.php b/server_status_monitor.php
index ec676d64a2..97f45cd601 100644
--- a/server_status_monitor.php
+++ b/server_status_monitor.php
@@ -428,33 +428,12 @@ $scripts->addFile('server_status_sorter.js');
 $ServerStatusData = new PMA_ServerStatusData();
 
 /**
- * Define some data needed on the client side
- */
-$input = '<input type="hidden" name="%s" value="%s" />';
-$form  = '<form id="js_data" class="hide">';
-$form .= sprintf($input, 'server_time', microtime(true) * 1000);
-$form .= sprintf($input, 'server_os', PHP_OS);
-$form .= sprintf($input, 'is_superuser', PMA_isSuperuser());
-$form .= sprintf($input, 'server_db_isLocal', $ServerStatusData->db_isLocal);
-$form .= '</form>';
-/**
- * Define some links used on client side
- */
-$links  = '<div id="profiling_docu" class="hide">';
-$links .= PMA_Util::showMySQLDocu('general-thread-states', 'general-thread-states');
-$links .= '</div>';
-$links .= '<div id="explain_docu" class="hide">';
-$links .= PMA_Util::showMySQLDocu('explain-output', 'explain-output');
-$links .= '</div>';
-
-/**
  * Output
  */
 $response->addHTML('<div>');
 $response->addHTML($ServerStatusData->getMenuHtml());
 $response->addHTML(PMA_getMonitorHtml($ServerStatusData));
-$response->addHTML($form);
-$response->addHTML($links);
+$response->addHTML(getClientSideDataAndLinksHtml($ServerStatusData));
 $response->addHTML('</div>');
 exit;
 
@@ -776,4 +755,36 @@ function getPopContentHtml()
     return $retval;
 }
 
+
+/**
+ * Define some data and links needed on the client side
+ *
+ * @param object $ServerStatusData An instance of the PMA_ServerStatusData class
+ *
+ * @return string
+ */
+function getClientSideDataAndLinksHtml($ServerStatusData)
+{
+	/**
+	 * Define some data needed on the client side
+     */
+	$input = '<input type="hidden" name="%s" value="%s" />';
+	$form  = '<form id="js_data" class="hide">';
+	$form .= sprintf($input, 'server_time', microtime(true) * 1000);
+	$form .= sprintf($input, 'server_os', PHP_OS);
+	$form .= sprintf($input, 'is_superuser', PMA_isSuperuser());
+	$form .= sprintf($input, 'server_db_isLocal', $ServerStatusData->db_isLocal);
+	$form .= '</form>';
+	/**
+	 * Define some links used on client side
+	 */
+	$links  = '<div id="profiling_docu" class="hide">';
+	$links .= PMA_Util::showMySQLDocu('general-thread-states', 'general-thread-states');
+	$links .= '</div>';
+	$links .= '<div id="explain_docu" class="hide">';
+	$links .= PMA_Util::showMySQLDocu('explain-output', 'explain-output');
+	$links .= '</div>';
+	
+	return $form . $links;
+}
 ?>