Permalink
Browse files

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop

…into development
  • Loading branch information...
vAugagneur committed Jan 17, 2013
2 parents 874beec + b9dde1d commit 1c0d0969fa5333283b6dfeda1a4867669227467b
Showing with 0 additions and 2 deletions.
  1. +0 −2 controllers/admin/AdminHomeController.php
@@ -493,8 +493,6 @@ public function ajaxProcessGetAdminHomeElement()
if (@fsockopen('api.prestashop.com', 80, $errno, $errst, AdminHomeController::TIPS_TIMEOUT))
$result['discover_prestashop'] .= '<div class="row-news"><div id="block_discover"><iframe frameborder="no" style="margin: 0px; padding: 0px; width: 100%; height:300px; overflow:hidden;" src="'.$protocol.'://api.prestashop.com/rss2/news2.php?v='._PS_VERSION_.'&lang='.$isoUser.'"></iframe></div>';
- else
- $result['discover_prestashop'] .= '';
// SHOW TIPS OF THE DAY
$content = @file_get_contents($protocol.'://api.prestashop.com/partner/tipsoftheday/?protocol='.$protocol.'&iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser), false, $stream_context);

0 comments on commit 1c0d096

Please sign in to comment.