resolve merge conflict

mantisbt · Nov 6, 2008 · 9ef7af2 · 9ef7af2
2 parents 74cd89a + 111fdc7
commit 9ef7af2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/tla.php b/tla.php
@@ -44,7 +44,6 @@ function tla_ads() {
 			if( isset($arr_xml['PostID'][$i]) && $arr_xml['PostID'][$i] > 0 ) continue;
 			echo $arr_xml['BeforeText'][$i]." <a href=\"".$arr_xml['URL'][$i]."\">".$arr_xml['Text'][$i]."</a> ".$arr_xml['AfterText'][$i]."<br />\n";
 		}
-		echo "</ul>";
 	}
 
 }
@@ -130,4 +129,4 @@ function html_entity_decode($string)
 
 tla_ads();
 
-?>
+?>
diff --git a/top.php b/top.php
@@ -1,19 +1,6 @@
 <?php
 	include( 'config_defaults_inc.php' );
 	require_once( 'utils_inc.php' );
-
-		if ( isset( $_SERVER['HTTP_X_FORWARDED_HOST'] ) ) { // Support ProxyPass
-			$t_host = $_SERVER['HTTP_X_FORWARDED_HOST'];
-		} else if ( isset( $_SERVER['HTTP_HOST'] ) ) {
-			$t_host = $_SERVER['HTTP_HOST'];
-		} else if ( isset( $_SERVER['SERVER_NAME'] ) ) {
-			$t_host = $_SERVER['SERVER_NAME'] . $t_port;
-		} else if ( isset( $_SERVER['SERVER_ADDR'] ) ) {
-			$t_host = $_SERVER['SERVER_ADDR'] . $t_port;
-		} else {
-			$t_host = 'www.mantisbt.org';
-		}
-
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>