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

okapi r590

Browse Source
This commit is contained in:
following
2013-03-29 02:51:53 +01:00
parent 881c3664c1
commit f89c8b6fd9
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/okapi/core.php
+1 -1
View File
@@ -778,7 +778,7 @@ class Okapi
{ {
public static $data_store; public static $data_store;
public static $server; public static $server;
public static $revision = 583; # This gets replaced in automatically deployed packages public static $revision = 590; # This gets replaced in automatically deployed packages
private static $okapi_vars = null; private static $okapi_vars = null;
/** Get a variable stored in okapi_vars. If variable not found, return $default. */ /** Get a variable stored in okapi_vars. If variable not found, return $default. */
htdocs/okapi/services/caches/geocache.xml
+1 -3
View File
@@ -170,9 +170,7 @@
<ul> <ul>
<li><b>uuid</b> - UUID of the image,</li> <li><b>uuid</b> - UUID of the image,</li>
<li><b>url</b> - URL of the image,</li> <li><b>url</b> - URL of the image,</li>
<li><b>thumb_url</b> - URL of a small (thumb) version of the image <li><b>thumb_url</b> - URL of a small (thumb) version of the image,</li>
<b>or null</b> when no thumb is available (e.g. there are no thumbs
for spoiler images),</li>
<li><b>caption</b> - plain-text string, caption of the image,</li> <li><b>caption</b> - plain-text string, caption of the image,</li>
<li><b>unique_caption</b> - plain-text string, to be used as a filename <li><b>unique_caption</b> - plain-text string, to be used as a filename
for Garmin's crappy images implementation (currently, they get image for Garmin's crappy images implementation (currently, they get image
htdocs/okapi/services/caches/geocaches.php
+2 -2
View File
@@ -450,7 +450,7 @@ class WebService
foreach ($results as &$result_ref) foreach ($results as &$result_ref)
$result_ref['images'] = array(); $result_ref['images'] = array();
$rs = Db::query(" $rs = Db::query("
select object_id, uuid, url, thumb_url, title, spoiler select object_id, uuid, url, title, spoiler
from pictures from pictures
where where
object_id in ('".implode("','", array_map('mysql_real_escape_string', array_keys($cacheid2wptcode)))."') object_id in ('".implode("','", array_map('mysql_real_escape_string', array_keys($cacheid2wptcode)))."')
@@ -472,7 +472,7 @@ class WebService
$results[$cache_code]['images'][] = array( $results[$cache_code]['images'][] = array(
'uuid' => $row['uuid'], 'uuid' => $row['uuid'],
'url' => $row['url'], 'url' => $row['url'],
'thumb_url' => $row['thumb_url'] ? $row['thumb_url'] : null, 'thumb_url' => Settings::get('SITE_URL') . 'thumbs.php?uuid=' . $row['uuid'],
'caption' => $row['title'], 'caption' => $row['title'],
'unique_caption' => self::get_unique_caption($row['title']), 'unique_caption' => self::get_unique_caption($row['title']),
'is_spoiler' => ($row['spoiler'] ? true : false), 'is_spoiler' => ($row['spoiler'] ? true : false),
htdocs/okapi/views/update.php
+1
View File
@@ -650,4 +650,5 @@ class View
private static function ver80() { Db::execute("alter table okapi_search_sets add column date_created datetime not null"); } private static function ver80() { Db::execute("alter table okapi_search_sets add column date_created datetime not null"); }
private static function ver81() { Db::execute("alter table okapi_search_sets add column expires datetime not null"); } private static function ver81() { Db::execute("alter table okapi_search_sets add column expires datetime not null"); }
private static function ver82() { CronJobController::reset_job_schedule("FulldumpGeneratorJob"); } private static function ver82() { CronJobController::reset_job_schedule("FulldumpGeneratorJob"); }
private static function ver83() { Db::execute("alter table okapi_stats_temp engine=InnoDB"); }
} }