1. Bilal Akhtar
  2. moin-2.0-gci

Commits

Sam Toyer  committed b02f88f

Fix diffraw view, fix text diffraw

  • Participants
  • Parent commits ec33b8e
  • Branches default

Comments (0)

Files changed (2)

File MoinMoin/apps/frontend/views.py

View file
 def _diff_raw(item, revid1, revid2):
     oldrev = item[revid1]
     newrev = item[revid2]
-    commonmt = _common_type(oldrev, newrev)
+    commonmt = _common_type(oldrev.meta[CONTENTTYPE], newrev.meta[CONTENTTYPE])
 
     try:
         item = Item.create(item.name, contenttype=commonmt, rev_id=newrev.revid)

File MoinMoin/items/__init__.py

View file
         difflines = diff_text.diff(oldlines, newlines)
         return '\n'.join(difflines)
 
+    _render_data_diff_raw = _render_data_diff
+
     def _render_data_highlight(self):
         from MoinMoin.converter import default_registry as reg
         data_text = self.data_storage_to_internal(self.data)