Merge branch 'stable'

This commit is contained in:
following 2013-07-16 13:34:39 +02:00
commit d5d83da510
2 changed files with 2 additions and 5 deletions

View File

@ -814,7 +814,7 @@ class Okapi
{
public static $data_store;
public static $server;
public static $revision = 878; # This gets replaced in automatically deployed packages
public static $revision = 879; # This gets replaced in automatically deployed packages
private static $okapi_vars = null;
/** Get a variable stored in okapi_vars. If variable not found, return $default. */

View File

@ -175,10 +175,7 @@ http://www.gsak.net/xmlv1/5 http://www.gsak.net/xmlv1/5/gsak.xsd
</ox:opencaching>
<? } ?>
</wpt>
<? } ?>
<? if ($vars['alt_wpts']) { ?>
<? foreach ($vars['caches'] as $c) { ?>
<? if ($c === null) continue; /* ignoring invalid cache codes */ ?>
<? if ($vars['alt_wpts']) { ?>
<? foreach ($c['alt_wpts'] as $wpt) { ?>
<? list($lat, $lon) = explode("|", $wpt['location']); ?>
<wpt lat="<?= $lat ?>" lon="<?= $lon ?>">