Other various changes
This commit is contained in:
@ -41,7 +41,7 @@ class ReferenceController extends AbstractController
|
||||
|
||||
$bible = self::$emi->getRepository(Bible::class)->findRange($bible, [$passage_start, $passage_end]);
|
||||
$passage = "{$passage_start}-{$passage_end}";
|
||||
$label = "{$bible[0]->getLabel()}\n{$bible[0]->getChapter()}:{$passage}";
|
||||
$label = "{$bible[0]->getLabel()}\n{$bible[0]->getChapter()}\n{$passage}";
|
||||
} elseif (is_int($passage)) {
|
||||
$bible = self::$emi->getRepository(Bible::class)->findBy(['book' => $book, 'chapter' => $chapter, 'verse' => $passage]);
|
||||
$label = "{$bible[0]->getLabel()}\n{$bible[0]->getChapter()}:{$passage}";
|
||||
@ -52,9 +52,9 @@ class ReferenceController extends AbstractController
|
||||
$passage = null;
|
||||
}
|
||||
|
||||
if(is_array($bible)) {
|
||||
if (is_array($bible)) {
|
||||
$text = [];
|
||||
foreach($bible as $b) {
|
||||
foreach ($bible as $b) {
|
||||
$text[] = "{$b->getVerse()}. {$b->getContent()}";
|
||||
}
|
||||
} else {
|
||||
@ -93,15 +93,16 @@ class ReferenceController extends AbstractController
|
||||
*
|
||||
* @param Reference $ref
|
||||
*
|
||||
* @return Reference
|
||||
* @return Reference|array
|
||||
*/
|
||||
public static function retrieveHC($ref): Reference
|
||||
public static function retrieveHC(Reference $ref): Reference|array
|
||||
{
|
||||
$r = self::$emi->getRepository(Reference::class)->findBy(['type' => 'hc', 'ndx' => $ref->getNdx()]);
|
||||
$r = self::$emi->getRepository(Reference::class)->findHeidelberg($ref->getLabel());
|
||||
|
||||
if (!$r) {
|
||||
return new Reference();
|
||||
}
|
||||
return $r[0];
|
||||
return $r;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -114,7 +115,7 @@ class ReferenceController extends AbstractController
|
||||
public static function retrieveBC($ref): Reference
|
||||
{
|
||||
$r = self::$emi->getRepository(Reference::class)->findBy(['type' => 'belgic', 'ndx' => $ref->getNdx()]);
|
||||
if(!$r) {
|
||||
if (!$r) {
|
||||
return new Reference();
|
||||
}
|
||||
return $r[0];
|
||||
|
Reference in New Issue
Block a user