OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
following 2013-07-17 13:29:23 +02:00
commit c319b6fc5b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/okapi/core.php
View File

@ -814,7 +814,7 @@ class Okapi
{
public static $data_store;
public static $server;
public static $revision = 879; # This gets replaced in automatically deployed packages
public static $revision = 880; # 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. */

2
htdocs/okapi/services/caches/geocaches.php
View File

@ -648,7 +648,7 @@ class WebService
where
cache_id in ('".implode("','", array_map('mysql_real_escape_string', array_keys($cacheid2wptcode)))."')
and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true")."
order by cache_id, date desc
order by cache_id, date desc, date_created desc
");
$loguuids = array();
$log2cache_map = array();