IS and ES status should carry over in diff view

application/library/View/Helper/BulletinEntryDiff.php

@@ -8,13 +8,14 @@ class Application_View_Helper_BulletinEntryDiff
     {
         // ES and IS
         $currentES = ($currentCourse->isEssentialStudies() == true ? '[ES]' : '');
-        $proposedES = ($proposedCourse->isEssentialStudies() == true ? '[ES]' : '');
+        $proposedES = $currentES;
         $diffES = $this->_getDiffText($currentES, $proposedES);
 
         $currentIS = ($currentCourse->integratedStudies == 'yes' ? '[IS]' : '');
-        $proposedIS = ($proposedCourse->integratedStudies == 'yes' ? '[IS]' : '');
         if (in_array($request->type->name, array('AddISToCourse'))) {
             $proposedIS = '[IS]';
+        } else {
+            $proposedIS = $currentIS;
         }
         $diffIS = $this->_getDiffText($currentIS, $proposedIS);