arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #610 from electerious/develop

Browse Source 
Lychee 3.1.4
This commit is contained in:
Tobias Reich 2016-08-28 13:14:18 +02:00 committed by GitHub
commit c0de7b8c63
6 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist/main.js vendored
View File

Binary file not shown.

7
docs/Changelog.md
View File

@ -1,3 +1,10 @@
## v3.1.4
Released August 28, 2016
- `Fixed` Search stopped working because of an undefined index error (#605)
- `Fixed` Better next/previous photo check to prevent an error when opening an album with only one photo
## v3.1.3 ## v3.1.3
Released August 22, 2016 Released August 22, 2016

2
php/helpers/search.php
View File

@ -21,7 +21,7 @@ function search($term) {
* Photos * Photos
*/ */
$query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE title LIKE '%?%' OR description LIKE '%?%' OR tags LIKE '%?%'", array(LYCHEE_TABLE_PHOTOS, $term, $term, $term)); $query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url, medium FROM ? WHERE title LIKE '%?%' OR description LIKE '%?%' OR tags LIKE '%?%'", array(LYCHEE_TABLE_PHOTOS, $term, $term, $term));
$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__); $result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
if ($result===false) return false; if ($result===false) return false;

2
src/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "Lychee", "name": "Lychee",
"version": "3.1.3", "version": "3.1.4",
"description": "Self-hosted photo-management done right.", "description": "Self-hosted photo-management done right.",
"authors": "Tobias Reich <tobias@electerious.com>", "authors": "Tobias Reich <tobias@electerious.com>",
"license": "MIT", "license": "MIT",

4
src/scripts/lychee.js
View File

@ -6,8 +6,8 @@
lychee = { lychee = {
title : document.title, title : document.title,
version : '3.1.3', version : '3.1.4',
versionCode : '030103', versionCode : '030104',
updatePath : '//update.electerious.com/index.json', updatePath : '//update.electerious.com/index.json',
updateURL : 'https://github.com/electerious/Lychee', updateURL : 'https://github.com/electerious/Lychee',

4
src/scripts/view.js
View File

@ -413,8 +413,8 @@ view.photo = {
let $nextArrow = lychee.imageview.find('a#next') let $nextArrow = lychee.imageview.find('a#next')
let $previousArrow = lychee.imageview.find('a#previous') let $previousArrow = lychee.imageview.find('a#previous')
let photoID = photo.getID() let photoID = photo.getID()
let hasNext = album.json && album.json.content && album.json.content[photoID] && album.json.content[photoID].nextPhoto!=='' let hasNext = album.json && album.json.content && album.json.content[photoID] && album.json.content[photoID].nextPhoto!=null && album.json.content[photoID].nextPhoto!==''
let hasPrevious = album.json && album.json.content && album.json.content[photoID] && album.json.content[photoID].previousPhoto!=='' let hasPrevious = album.json && album.json.content && album.json.content[photoID] && album.json.content[photoID].previousPhoto!=null && album.json.content[photoID].previousPhoto!==''
if (hasNext===false || lychee.viewMode===true) { if (hasNext===false || lychee.viewMode===true) {