From: Ryan S. <man...@ry...> - 2005-09-19 15:54:40
|
On Sep 19, 2005, at 17:01, Kenzaburo Ito wrote: >> I have screwed up the web site. I made a minor change to the >> adsense_vertical_inc.php and now it shows up online as a conflict: > Thanks for pointing it out Ryan. I've fixed things on the server > and in the respository. The repository and server should mirror > each other. > > I removed the phpAds material as that package has a security issue. Thanks, Ken. I was quite alarmed when my changes blew up the site like that. Glad you've put it right. Presumably somebody had manually edited adsense_vertical_inc.php on the production server and removed its contents. Now that the production server matches the repository again, that file has its contents back, meaning that clients are again requesting files from / ads/ which as you say is gone. Should we therefore comment out the code in the adsense file, for example like this: Index: adsense_vertical_inc.php =================================================================== RCS file: /cvsroot/mantisbt/web/adsense_vertical_inc.php,v retrieving revision 1.5 diff -u -r1.5 adsense_vertical_inc.php --- adsense_vertical_inc.php 19 Sep 2005 01:18:38 -0000 1.5 +++ adsense_vertical_inc.php 19 Sep 2005 15:46:31 -0000 @@ -1,5 +1,6 @@ </td> <td style="padding: 4px;"> +<?php if (0): ?> <script type="text/javascript"> <!-- if (!document.phpAds_used) document.phpAds_used = ','; @@ -15,3 +16,4 @@ document.write ('"><\/script>'); //--> </script><noscript><a href="http://www.mantisbt.org/ads/adclick.php? n=a54dfa62" target="_blank"><img src="http://www.mantisbt.org/ads/ adview.php?what=zone:3&n=a54dfa62" border="0" alt=""></a></noscript> +<?php endif; ?> |