Merge branch 'stable'

OpencachingDeutschland · May 8, 2013 · 71698ef · 71698ef
2 parents 5a24fcb + 4daee1d
commit 71698ef
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/htdocs/newcaches.php b/htdocs/newcaches.php
@@ -27,7 +27,20 @@
 
 		$newCaches = array();
 
-		$rsNewCaches = sql_slave('SELECT `caches`.`cache_id` `cacheid`, `caches`.`wp_oc` `wpoc`, `user`.`user_id` `userid`, `caches`.`country` `country`, `caches`.`name` `cachename`, `caches`.`type`, `user`.`username` `username`, `caches`.`date_created` `date_created` FROM `caches` INNER JOIN `user` ON `caches`.`user_id`=`user`.`user_id` WHERE `caches`.`status` = 1 ORDER BY `caches`.`date_created` DESC LIMIT ' . ($startat+0) . ', ' . ($perpage+0));
+		$rsNewCaches = sql_slave(
+					"SELECT `caches`.`cache_id` `cacheid`, `caches`.`wp_oc` `wpoc`,
+					        `caches`.`name` `cachename`, `caches`.`type`, `caches`.`country` `country`,
+					        `caches`.`date_created` `date_created`,
+					        IFNULL(`sys_trans_text`.`text`,`countries`.`en`) AS `country_name`,
+					        `user`.`user_id` `userid`, `user`.`username` `username`
+					  FROM `caches`
+			INNER JOIN `user` ON `caches`.`user_id`=`user`.`user_id`
+			 LEFT JOIN `countries` ON `countries`.`short` = `caches`.`country`
+			 LEFT JOIN `sys_trans_text` ON `sys_trans_text`.`trans_id` = `countries`.`trans_id`
+			           AND `sys_trans_text`.`lang` = '" . sql_escape($opt['template']['locale']) . "'
+			     WHERE `caches`.`status` = 1
+			  ORDER BY `caches`.`date_created` DESC
+				   LIMIT " . ($startat+0) . ', ' . ($perpage+0));
 			// see also write_newcaches_urls() in sitemap.class.php
 		while ($rNewCache = sql_fetch_assoc($rsNewCaches))
 			$newCaches[] = $rNewCache;

diff --git a/htdocs/templates2/ocstyle/newcaches.tpl b/htdocs/templates2/ocstyle/newcaches.tpl
@@ -30,7 +30,7 @@
 	{foreach name=newCaches from=$newCaches item=newCache}
 		<tr>
 			<td style="width:1%; vertical-align:center">{$newCache.date_created|date_format:$opt.format.date}</td>
-			<td class="listicon"><img src="resource2/{$opt.template.style}/images/cacheicon/16x16-{$newCache.type}.gif" width="16" height="16" border="0" /></td><td style="vertical-align:center"> <a href="viewcache.php?wp={$newCache.wpoc}">{$newCache.cachename|escape}</a> {t}by{/t} <a href="viewprofile.php?userid={$newCache.userid}">{$newCache.username|escape}</a> {if $newCache.country != $defaultcountry}&nbsp;&nbsp;<img src="images/flags/{$newCache.country|lower}.gif" >{/if} </td>
+			<td class="listicon"><img src="resource2/{$opt.template.style}/images/cacheicon/16x16-{$newCache.type}.gif" width="16" height="16" border="0" /></td><td style="vertical-align:center"> <a href="viewcache.php?wp={$newCache.wpoc}">{$newCache.cachename|escape}</a> {t}by{/t} <a href="viewprofile.php?userid={$newCache.userid}">{$newCache.username|escape}</a> {if $newCache.country != $defaultcountry}&nbsp;&nbsp;<img src="images/flags/{$newCache.country|lower}.gif" alt="({$newCache.country_name})" title="{$newCache.country_name}" />{/if} </td>
 		</tr>
 	{/foreach}