Merge remote-tracking branch 'origin/release-v2.0' into canada-v2.0

ckan/config/deployment.ini_tmpl

@@ -79,9 +79,6 @@ who.config_file = %(here)s/who.ini
 who.log_level = warning
 who.log_file = %(cache_dir)s/who_log.ini
 
-# Location of RDF versions of datasets
-#rdf_packages = http://semantic.ckan.net/record/
-
 # Location of licenses group (defaults to cached local version of ckan group)
 #licenses_group_url = http://licenses.opendefinition.org/licenses/groups/ckan.json
 

ckan/controllers/package.py

@@ -225,7 +225,7 @@ def pager_url(q=None, page=None):
                     'groups': _('Groups'),
                     'tags': _('Tags'),
                     'res_format': _('Formats'),
-                    'license': _('Licence'),
+                    'license_id': _('Licence'),
                     }
 
             for facet in g.facets:

ckan/controllers/user.py

@@ -571,8 +571,9 @@ def dashboard(self, id=None, offset=0):
             context, {'id': c.userobj.id, 'q': q})
         c.dashboard_activity_stream_context = self._get_dashboard_context(
             filter_type, filter_id, q)
-        c.dashboard_activity_stream = h.dashboard_activity_stream(filter_type,
-                filter_id, offset)
+        c.dashboard_activity_stream = h.dashboard_activity_stream(
+            c.userobj.id, filter_type, filter_id, offset
+        )
 
         # Mark the user's new activities as old whenever they view their
         # dashboard page.