From 7ab88cbcf2b6cd7c1069634fbdab14b16e26335c Mon Sep 17 00:00:00 2001 From: Ana Willem Date: Thu, 2 Jun 2016 11:41:12 -0500 Subject: [PATCH 1/3] Adding an if/then filter for empty sql retrieval instances. --- classes/OccurrenceEditorManager.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/classes/OccurrenceEditorManager.php b/classes/OccurrenceEditorManager.php index 2f54cec70a..48be721bb1 100644 --- a/classes/OccurrenceEditorManager.php +++ b/classes/OccurrenceEditorManager.php @@ -1648,9 +1648,10 @@ public function getExternalEditArr(){ 'CONCAT_WS(", ",u.lastname,u.firstname) AS username, r.externaltimestamp, r.initialtimestamp '. 'FROM omoccurrevisions r LEFT JOIN users u ON r.uid = u.uid '. 'WHERE (r.occid = '.$this->occid.') ORDER BY r.initialtimestamp DESC '; - //echo '
'.$sql.'
'; + echo '
'.$sql.'
'; $rs = $this->conn->query($sql); - while($r = $rs->fetch_object()){ + echo '
' . print_r($rs) . '
'; + while($r = $rs->fetch_object()){ $editor = $r->externaleditor; if($r->username) $editor .= ' ('.$r->username.')'; $ts = $r->initialtimestamp; @@ -1926,4 +1927,4 @@ private function cleanRawFragment($str){ return $newStr; } } -?> \ No newline at end of file +?> From 2c4e7fde5f511aee476996fa9b85fdc2742a7702 Mon Sep 17 00:00:00 2001 From: Ana Willem Date: Thu, 2 Jun 2016 11:42:47 -0500 Subject: [PATCH 2/3] Fixing bad capitalization of file --- content/lang/checklists/checklistadmin.en.php | 2 +- content/lang/checklists/checklistadmin.es.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/lang/checklists/checklistadmin.en.php b/content/lang/checklists/checklistadmin.en.php index 9ab7d26e8d..234ca508dd 100644 --- a/content/lang/checklists/checklistadmin.en.php +++ b/content/lang/checklists/checklistadmin.en.php @@ -5,7 +5,7 @@ ------------------ */ -include_once('Checklist.en.php'); +include_once('checklist.en.php'); $LANG['NAV_HOME'] = 'Home'; $LANG['CHECKADMIN'] = ' Checklist Administration'; diff --git a/content/lang/checklists/checklistadmin.es.php b/content/lang/checklists/checklistadmin.es.php index ab0d08f3d9..49f2d48d5c 100644 --- a/content/lang/checklists/checklistadmin.es.php +++ b/content/lang/checklists/checklistadmin.es.php @@ -5,7 +5,7 @@ ------------------ */ -include_once('Checklist.en.php'); +include_once('checklist.en.php'); $LANG['NAV_HOME'] = 'Inicio'; $LANG['CHECKADMIN'] = ' Administración de Listado de Comprobación'; @@ -70,4 +70,4 @@ $LANG['DELETECHECK'] = 'Borrar Listado de Comprobación'; $LANG['SUBMITCHANG'] = 'Someter Cambios'; $LANG['DELETETHISU'] = 'Borrar este usuario'; -?> \ No newline at end of file +?> From 8fd177ce7093c815ad40ea4dbd859682901861be Mon Sep 17 00:00:00 2001 From: Ana Willem Date: Thu, 2 Jun 2016 17:09:33 -0500 Subject: [PATCH 3/3] Adding css/jquery.css to .gitignore, the conversion of this file also needs to be still added here: http://symbiota.org/docs/installation-instructions/ in section 3. --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 30d6e9138e..6cc6df19c0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,8 +6,9 @@ config/dbconnection.php config/symbini.php css/main.css +css/jquery-ui.css css/speciesprofile.css footer.php header.php leftmenu.php -.settings/org.eclipse.php.core.prefs \ No newline at end of file +.settings/org.eclipse.php.core.prefs