Merge branch 'master' of github.com:qgis/Quantum-GIS

Author: kyngchaos

src/app/qgisappinterface.cpp

@@ -531,7 +531,14 @@ bool QgisAppInterface::openFeatureForm( QgsVectorLayer *vlayer, QgsFeature &f, b
     return false;
 
   QgsFeatureAction action( tr( "Attributes changed" ), f, vlayer, -1, -1, QgisApp::instance() );
-  return action.editFeature();
+  if (vlayer->isEditable())
+  {
+    return action.editFeature();
+  }
+  else
+  {
+      return action.viewFeatureForm();
+  }
 }
 
 QDialog* QgisAppInterface::getFeatureForm( QgsVectorLayer *l, QgsFeature &f )