Fix some warnings and errors caused by the previous commit. re #34
This commit is contained in:
parent
b46d1f524c
commit
185c59ce15
2
base.php
2
base.php
|
@ -723,7 +723,7 @@ class PageQueryResult extends Page
|
||||||
$this->entryArray = Author::getAuthorsByStartingLetter ('%' . $this->query);
|
$this->entryArray = Author::getAuthorsByStartingLetter ('%' . $this->query);
|
||||||
break;
|
break;
|
||||||
case self::SCOPE_TAG :
|
case self::SCOPE_TAG :
|
||||||
$this->entryArray = Tag::getAllTagsByQuery ($this->query);
|
list ($this->entryArray, $this->totalNumber) = Tag::getAllTagsByQuery ($this->query, -1);
|
||||||
break;
|
break;
|
||||||
case self::SCOPE_SERIES :
|
case self::SCOPE_SERIES :
|
||||||
$this->entryArray = Serie::getAllSeriesByQuery ($this->query);
|
$this->entryArray = Serie::getAllSeriesByQuery ($this->query);
|
||||||
|
|
3
book.php
3
book.php
|
@ -591,9 +591,10 @@ function getJson ($complete = false) {
|
||||||
$out = array ();
|
$out = array ();
|
||||||
$pagequery = Base::PAGE_OPENSEARCH_QUERY;
|
$pagequery = Base::PAGE_OPENSEARCH_QUERY;
|
||||||
|
|
||||||
|
// Special case when no databases were chosen, we search on all databases
|
||||||
if (is_array ($config['calibre_directory']) && $multi === "1") {
|
if (is_array ($config['calibre_directory']) && $multi === "1") {
|
||||||
$i = 0;
|
$i = 0;
|
||||||
foreach ($config['calibre_directory'] as $key => $value) {
|
foreach (array_keys ($config['calibre_directory']) as $key) {
|
||||||
Base::clearDb ();
|
Base::clearDb ();
|
||||||
array_push ($out, array ("title" => $key,
|
array_push ($out, array ("title" => $key,
|
||||||
"class" => "tt-header",
|
"class" => "tt-header",
|
||||||
|
|
Loading…
Reference in a new issue