www: 7acf0e49: inc/blurb.download.inc is now only used ..

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 7acf0e49e6ecbd170054c45e30d15262e71090ea
Parent:   702fa5dacd6244326b77d77a20971f8243e96540
Author:   markdoliner at pidgin.im
Date:     05/03/12 02:13:43
Branch:   im.pidgin.www
URL: http://d.pidgin.im/viewmtn/revision/info/7acf0e49e6ecbd170054c45e30d15262e71090ea

Changelog: 

inc/blurb.download.inc is now only used from one place.  Inline it.

Changes against parent 702fa5dacd6244326b77d77a20971f8243e96540

  dropped  inc/blurb.download.inc
  patched  htdocs/index.php

-------------- next part --------------
============================================================
--- htdocs/index.php	a554de586921dfc703a5e02e3c7b9e5e592f1624
+++ htdocs/index.php	017533a3c69e6964d146ed40fb92baede86bf60f
@@ -20,7 +20,21 @@
 
 <div id="download">
 <img src="/shared/img/logo.pidgin.png" alt="[Pidgin Logo]" id="logo" width="107" height="185" />
-<?php include($_SERVER['DOCUMENT_ROOT'] . "/../inc/blurb.download.inc"); ?>
+
+
+<?php include($_SERVER['DOCUMENT_ROOT'] . "/../inc/blurb.downloaddetect.inc"); ?>
+
+<a id="download_link" href="<?php echo $download_link; ?>">
+<img src="/shared/img/button.download.png" alt="[Down Arrow]" id="downbutton" width="48" height="48" />
+Download Pidgin<br />
+<span class="number"><?php echo $download_version, ' ', $download_os; ?></span></a>
+<?php include($_SERVER['DOCUMENT_ROOT'] . "/../inc/langdetect.inc");
+if (strlen($language) > 0 && $language != "English") {
+?>
+<span class="number"><?php echo $language ?></span>
+<?php } ?>
+
+
 </div>
 
 <p class="linkbar">
============================================================
--- inc/blurb.download.inc	1b134092f38c8a03d5fc79a13311f322c1b5bac8
+++ /dev/null	
@@ -1,13 +0,0 @@
-<?php
-include($_SERVER['DOCUMENT_ROOT'] . "/../inc/blurb.downloaddetect.inc");
-?>
-
-<a id="download_link" href="<?php echo $download_link; ?>">
-<img src="/shared/img/button.download.png" alt="[Down Arrow]" id="downbutton" width="48" height="48" />
-Download Pidgin<br />
-<span class="number"><?php echo $download_version, ' ', $download_os; ?></span></a>
-<?php include($_SERVER['DOCUMENT_ROOT'] . "/../inc/langdetect.inc");
-if (strlen($language) > 0 && $language != "English") {
-?>
-<span class="number"><?php echo $language ?></span>
-<?php } ?>