Changed frappe.conn to frappe.db

erpnext/home/__init__.py

@@ -64,11 +64,11 @@ def make_feed(feedtype, doctype, name, owner, subject, color):
 
 	if feedtype in ('Login', 'Comment', 'Assignment'):
 		# delete old login, comment feed
-		frappe.conn.sql("""delete from tabFeed where 
+		frappe.db.sql("""delete from tabFeed where 
 			datediff(curdate(), creation) > 7 and doc_type in ('Comment', 'Login', 'Assignment')""")
 	else:
 		# one feed per item
-		frappe.conn.sql("""delete from tabFeed
+		frappe.db.sql("""delete from tabFeed
 			where doc_type=%s and doc_name=%s 
 			and ifnull(feed_type,'') != 'Comment'""", (doctype, name))
 

erpnext/home/doctype/feed/feed.py

@@ -15,8 +15,8 @@ class DocType:
     self.doc, self.doclist = d, dl
 	
 def on_doctype_update():
-	if not frappe.conn.sql("""show index from `tabFeed` 
+	if not frappe.db.sql("""show index from `tabFeed` 
 		where Key_name="feed_doctype_docname_index" """):
-		frappe.conn.commit()
-		frappe.conn.sql("""alter table `tabFeed` 
+		frappe.db.commit()
+		frappe.db.sql("""alter table `tabFeed` 
 			add index feed_doctype_docname_index(doc_type, doc_name)""")

erpnext/home/page/activity/activity.py

@@ -7,7 +7,7 @@ import frappe
 @frappe.whitelist()
 def get_feed(arg=None):
 	"""get feed"""	
-	return frappe.conn.sql("""select
+	return frappe.db.sql("""select
 		distinct t1.name, t1.feed_type, t1.doc_type, t1.doc_name, t1.subject, t1.owner,
 		t1.modified
 		from tabFeed t1, tabDocPerm t2