Merge branch 'release/2.0.4'

RELEASE-LIST.md

@@ -20,7 +20,7 @@ It's easiest to start with a fresh repository, so the instructions start there.
 1. `git add --all views/shared/javascripts`
 1. `git commit`
 1. Update i18n:
-   * `tx pull --all`
+   * `tx pull --all --force`
    * `rake update_pot build_mo`
    * `git add --all languages`
    * `git commit` (if there are new translations)

lib/NeatlineFeatures/Utils/View.php

@@ -163,7 +163,7 @@ public function setViewOptions($text, $record, $elementText=NULL)
         $this->_text        = $text;
         $this->_record      = $record;
         $this->_elementText = $elementText;
-        if (!is_null($elementText)) {
+        if (!is_null($elementText) && $elementText != NULL) {
             $this->_value   = $elementText->text;
         }
         $this->createInputNameStem();
@@ -412,7 +412,7 @@ public function isHtml()
             }
         } else {
             $etext = $this->getElementText();
-            if (isset($etext)) {
+            if (isset($etext) && $etext != NULL && !is_null($etext)) {
                 $isHtml = (bool)$etext->html;
             }
         }
@@ -522,9 +522,10 @@ public function getView()
         $etext  = $this->_elementText;
 
         // Pull a fresh $value, if we can.
-        $value = is_null($etext) ? $this->_text : $etext->getText();
+        $value = (is_null($etext) || $etext == NULL)
+               ? $this->_text : $etext->getText();
 
-        if (! is_null($etext) && is_null($etext->record_id)) {
+        if (! is_null($etext) && $etext != NULL && is_null($etext->record_id)) {
             // There's no data for this.
             $view = '';
         } else if ((bool)$isMap) {

models/Table/Table_NeatlineFeature.php

@@ -184,7 +184,8 @@ public function getRecordByText($value)
      **/
     public function getRecordByElementText($element_text)
     {
-        if (is_null($element_text->record_id)) {
+        if (is_null($element_text) || $element_text == NULL ||
+            is_null($element_text->record_id)) {
             $select = NULL;
         } else {
             $select = $this->_db

package.json

@@ -1,6 +1,6 @@
 {
     "name"         : "neatlinefeatures",
-    "version"      : "2.0.3",
+    "version"      : "2.0.4",
     "dependencies" : {
         "inireader"     : "~0.2.4",
         "iniparser"     : "~1.0.5",

plugin.ini

@@ -8,7 +8,7 @@ author="Scholars' Lab"
 description="Allows administrators to draw things on maps and associate them with an Omeka item."
 link="https://github.com/scholarslab/NeatlineFeatures"
 support_link="https://github.com/scholarslab/NeatlineFeatures/issues"
-version="2.0.3"
+version="2.0.4"
 tags="geospatial"
 omeka_minimum_version="2.0"
 omeka_tested_up_to="2.0"

version

@@ -1 +1 @@
-2.0.3
+2.0.4