Merge branch 'hotfix/2.0.5'

scholarslab · Aug 12, 2014 · 3e86830 · 3e86830
2 parents d7f5733 + afb3461
commit 3e86830
Show file tree

Hide file tree

Showing 8 changed files with 145 additions and 127 deletions.
diff --git a/features/data/db-dump.sql.gz b/features/data/db-dump.sql.gz
diff --git a/lib/NeatlineFeatures/Utils/View.php b/lib/NeatlineFeatures/Utils/View.php
@@ -605,11 +605,13 @@ private function _getHtmlView($isHtml, $isMap, $mode)
 
         if (is_null($post)) {
             $feature    = $this->getNeatlineFeature();
-            $geo        = $feature->geo;
-            $zoom       = $feature->zoom;
-            $center_lon = $feature->center_lon;
-            $center_lat = $feature->center_lat;
-            $base_layer = $feature->base_layer;
+            if (!is_null($feature)) {
+                $geo        = $feature->geo;
+                $zoom       = $feature->zoom;
+                $center_lon = $feature->center_lon;
+                $center_lat = $feature->center_lat;
+                $base_layer = $feature->base_layer;
+            }
         } else {
             $i          = $this->getIndex();
             $p          = array_key_exists($i, $post) ? $post[$i] : array();

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name"         : "neatlinefeatures",
-    "version"      : "2.0.4",
+    "version"      : "2.0.5",
     "dependencies" : {
         "inireader"     : "~0.2.4",
         "iniparser"     : "~1.0.5",

diff --git a/plugin.ini b/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.4"
+version="2.0.5"
 tags="geospatial"
 omeka_minimum_version="2.0"
 omeka_tested_up_to="2.0"

diff --git a/version b/version
@@ -1 +1 @@
-2.0.4
+2.0.5
diff --git a/views/shared/javascripts/featureswidget.js b/views/shared/javascripts/featureswidget.js
diff --git a/...avascripts/neatline-features-2.0.4-min.js → ...avascripts/neatline-features-2.0.5-min.js b/...avascripts/neatline-features-2.0.4-min.js → ...avascripts/neatline-features-2.0.5-min.js