Merge pull request #40 from BioKIC/master

Pull master into KDP_dev
BioKIC · Jul 23, 2021 · 4b394f0 · 4b394f0
2 parents ac62dca + eca7be1
commit 4b394f0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/classes/ChecklistManager.php b/classes/ChecklistManager.php
@@ -214,7 +214,7 @@ public function getTaxaList($pageNumber = 1,$retLimit = 500){
 				$taxonTokens = $newArr;
 			}
 			if(!$retLimit || ($this->taxaCount >= (($pageNumber-1)*$retLimit) && $this->taxaCount <= ($pageNumber)*$retLimit)){
-				if($row->morphospecies) $sciName .= ' '.$row->morphospecies;
+			    if(isset($row->morphospecies) && $row->morphospecies) $sciName .= ' '.$row->morphospecies;
 				elseif($row->rankid == 180) $sciName .= " sp.";
 				if($row->rankid > 220 && $this->clMetadata['type'] != 'rarespp' && !array_key_exists($row->parenttid, $this->taxaList)){
 					$this->taxaList[$row->parenttid]['taxongroup'] = '<i>'.$taxonGroup.'</i>';

diff --git a/collections/harvestparams.php b/collections/harvestparams.php
@@ -98,7 +98,7 @@
 					</div>
 				</div>
 				<div style='float:right;margin:0px 10px;'>
-					<div><button type="submit" style="width:100%"><?php echo isset($LANG['BUTTON_NEXT_LIST']?$LANG['BUTTON_NEXT_LIST']:'List Display'); ?></button></div>
+					<div><button type="submit" style="width:100%"><?php echo isset($LANG['BUTTON_NEXT_LIST'])?$LANG['BUTTON_NEXT_LIST']:'List Display'; ?></button></div>
 					<div><button type="button" style="width:100%" onclick="displayTableView(this.form)"><?php echo isset($LANG['BUTTON_NEXT_TABLE'])?$LANG['BUTTON_NEXT_TABLE']:'Table Display'; ?></button></div>
 					<div><button type="reset" style="width:100%" onclick="resetHarvestParamsForm()"><?php echo isset($LANG['BUTTON_RESET'])?$LANG['BUTTON_RESET']:'Reset Form'; ?></button></div>
 				</div>

diff --git a/games/flashcards.php b/games/flashcards.php
@@ -149,7 +149,7 @@ function tellMe(){
 		echo $checklists_flashcardsCrumbs;
 	}
 	else{
-		echo '<a href="../checklists/checklist.php?clid='.$clid.'">';
+		echo '<a href="../checklists/checklist.php?clid='.$clid.'&dynclid='.$dynClid.'">';
 		echo $fcManager->getClName();
 		echo '</a> &gt;&gt; ';
 	}

diff --git a/games/namegame.php b/games/namegame.php
@@ -568,7 +568,7 @@ function wildCard(){
 		echo $games_namegameCrumbs;
 	}
 	else{
-		echo '<a href="../checklists/checklist.php?clid='.$clid.'">';
+		echo '<a href="../checklists/checklist.php?clid='.$clid.'&dynclid='.$dynClid.'">';
 		echo $clName;
 		echo '</a> &gt;&gt; ';
 	}