Merge branch 'master' of ssh://git.eclipse.org/gitroot/orion/org.eclipse.orion.client
diff --git a/bundles/org.eclipse.orion.client.core/web/js-tests/pluginRegistry/testcase.js b/bundles/org.eclipse.orion.client.core/web/js-tests/pluginRegistry/testcase.js
index 04fca19..0ba1996 100644
--- a/bundles/org.eclipse.orion.client.core/web/js-tests/pluginRegistry/testcase.js
+++ b/bundles/org.eclipse.orion.client.core/web/js-tests/pluginRegistry/testcase.js
@@ -97,7 +97,7 @@
 		var promise = pluginRegistry.installPlugin("testPlugin.html").then(function(plugin) {
 			var pluginInfo = {
 				location: plugin.getLocation(),
-				data: plugin.getHeaders()
+				data: plugin._getData()
 			};
 
 			assert.equal(pluginRegistry.getPlugins().length, 1);
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/pluginregistry.js b/bundles/org.eclipse.orion.client.core/web/orion/pluginregistry.js
index d081d30..b09fd4a 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/pluginregistry.js
+++ b/bundles/org.eclipse.orion.client.core/web/orion/pluginregistry.js
@@ -254,17 +254,27 @@
 		 * @return {Object} The plugin headers
 		 * @function
 		 */
-		this.getHeaders = function(falsy) {
-			var noData = falsy ? null : {};
-			return data && data.headers ? data.headers : noData;
+		this.getHeaders = function() {
+			if (data) {
+				return data.headers || {};
+			}
+			return null;
 		};
 		
 		this.getName = function() {
-			return this.getHeaders()["plugin.name"] || this.getLocation();
+			var headers = this.getHeaders();
+			if (headers) {
+				return headers["plugin.name"] || "";
+			}
+			return null;
 		};
 		
 		this.getVersion = function() {
-			return this.getHeaders()["plugin.version"] || "0.0.0";
+			var headers = this.getHeaders();
+			if (headers) {
+				return headers["plugin.version"] || "0.0.0";
+			}
+			return null;
 		};
 		
 		this.getLastModified = function() {
@@ -621,7 +631,7 @@
 			var d = new Deferred();
 			var plugin = _getPlugin(url);
 			if (plugin) {
-				if(plugin.getHeaders(true)) {
+				if(plugin.getHeaders()) {
 					d.resolve(plugin);
 				} else {
 					var pluginTracker = function(plugin) {
@@ -635,7 +645,7 @@
 			} else {
 				plugin = new Plugin(url, opt_data, internalRegistry);
 				_plugins.push(plugin);
-				if(plugin.getHeaders(true)) {
+				if(plugin.getHeaders()) {
 					_persist(plugin);
 					d.resolve(plugin);
 				} else {				
@@ -659,10 +669,9 @@
 		this.getPlugins = function() {
 			var result =[];
 			_plugins.forEach(function(plugin) {
-				// TODO: what was the purpose of this test?
-//				if (plugin.getHeaders(true)) {
+				if (plugin.getHeaders()) {
 					result.push(plugin);
-//				}
+				}
 			});
 			return result;
 		};
@@ -676,7 +685,7 @@
 		 */
 		this.getPlugin = function(url) {
 			var plugin = _getPlugin(url);
-			if (plugin && plugin.getHeaders(true)) {
+			if (plugin && plugin.getHeaders()) {
 				return plugin;
 			}
 			return null;
diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/textview/textView.js b/bundles/org.eclipse.orion.client.editor/web/orion/textview/textView.js
index 4b1712b..8d8ce08 100644
--- a/bundles/org.eclipse.orion.client.editor/web/orion/textview/textView.js
+++ b/bundles/org.eclipse.orion.client.editor/web/orion/textview/textView.js
@@ -3669,7 +3669,7 @@
 				if (index === cells.length) { return; }
 				row.cells[index]._ruler = undefined;
 				row.deleteCell(index);
-				if (cells.length !== 0) {
+				if (cells.length === 0) {
 					rulerParent.style.display = "none";
 				}
 			}