Merge branch 'master' of https://github.com/Symbiota/Symbiota

Author: egbot

classes/GlossaryUpload.php

@@ -646,6 +646,7 @@ public function getFullCollectionList($catId = ''){
 	}
 
 	public function outputFullCollArr($occArr){
+		global $DEFAULTCATID;
 		$collCnt = 0;
 		if(isset($occArr['cat'])){
 			$categoryArr = $occArr['cat'];
@@ -679,7 +680,7 @@ public function outputFullCollArr($occArr){
 						</td>
 						<td style="padding:9px 5px;width:10px;">
 							<a href="#" onclick="toggleCat('<?php echo $idStr; ?>');return false;">
-								<img id="plus-<?php echo $idStr; ?>" src="../images/plus_sm.png" style="<?php echo ($cnt?'':'display:none;') ?>" /><img id="minus-<?php echo $idStr; ?>" src="../images/minus_sm.png" style="<?php echo ($cnt?'display:none;':'') ?>" />
+								<img id="plus-<?php echo $idStr; ?>" src="../images/plus_sm.png" style="<?php echo (($DEFAULTCATID && $DEFAULTCATID != $catid)?'':'display:none;') ?>" /><img id="minus-<?php echo $idStr; ?>" src="../images/minus_sm.png" style="<?php echo (($DEFAULTCATID && $DEFAULTCATID != $catid)?'display:none;':'') ?>" />
 							</a>
 						</td>
 						<td style="padding-top:8px;">
@@ -692,7 +693,7 @@ public function outputFullCollArr($occArr){
 					</tr>
 					<tr>
 						<td colspan="4">
-							<div id="cat-<?php echo $idStr; ?>" style="<?php echo ($cnt?'display:none;':'') ?>margin:10px;padding:10px 20px;border:inset">
+							<div id="cat-<?php echo $idStr; ?>" style="<?php echo (($DEFAULTCATID && $DEFAULTCATID != $catid)?'display:none;':'') ?>margin:10px;padding:10px 20px;border:inset">
 								<table>
 									<?php
 									foreach($catArr as $collid => $collName2){

classes/OccurrenceManager.php

@@ -139,7 +139,7 @@ public function getVernaculars(){
 		$sql = "SELECT v.VID, v.VernacularName, v.Language, v.Source, v.username, v.notes, v.SortSequence ".
 			"FROM taxavernaculars v ".
 			"WHERE (v.tid = ".$this->tid.") ";
-		if($this->language) $sql .= "AND (v.Language = '".$this->language."') ";
+		//if($this->language) $sql .= "AND (v.Language = '".$this->language."') ";
 		$sql .= "ORDER BY v.Language, v.SortSequence";
 		$result = $this->taxonCon->query($sql);
 		$vernCnt = 0;

classes/TPEditorManager.php

@@ -351,12 +351,30 @@ ALTER TABLE `omcollectionstats`
 	MODIFY COLUMN `dynamicProperties` longtext NULL AFTER `uploadedby`;
 
 ALTER TABLE `glossary`
-	ADD COLUMN `resourceurl`  varchar(600) NULL AFTER `notes`;
+	ADD COLUMN `resourceurl`  varchar(600) NULL AFTER `notes`,
 	MODIFY COLUMN `definition`  varchar(1000) NULL DEFAULT NULL AFTER `term`;
 
 ALTER TABLE `taxadescrblock`
 	MODIFY COLUMN `caption`  varchar(40) NULL DEFAULT NULL AFTER `tid`;
-
-
-
-
+	
+ALTER TABLE `glossarytaxalink` 
+	DROP FOREIGN KEY `glossarytaxalink_ibfk_1`,
+	DROP FOREIGN KEY `glossarytaxalink_ibfk_2`;
+	
+ALTER TABLE `glossarytermlink` DROP FOREIGN KEY `glossarytermlink_ibfk_1`;
+
+CREATE TABLE `uploadglossary` (
+  `term` varchar(150) DEFAULT NULL,
+  `definition` varchar(1000) DEFAULT NULL,
+  `language` varchar(45) DEFAULT NULL,
+  `source` varchar(600) DEFAULT NULL,
+  `notes` varchar(250) DEFAULT NULL,
+  `resourceurl` varchar(600) DEFAULT NULL,
+  `tidStr` varchar(100) DEFAULT NULL,
+  `synonym` tinyint(1) DEFAULT NULL,
+  `newGroupId` int(10) DEFAULT NULL,
+  `currentGroupId` int(10) DEFAULT NULL,
+  `InitialTimeStamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  KEY `term_index` (`term`),
+  KEY `relatedterm_index` (`newGroupId`)
+);