diff --git a/application/modules/bulletin/controllers/ViewController.php b/application/modules/bulletin/controllers/ViewController.php index c6da5d621b6178807fa6e7b58756c5e630359cb6..6acd63ce8006f7c512978b8525c9ba36344fb313 100644 --- a/application/modules/bulletin/controllers/ViewController.php +++ b/application/modules/bulletin/controllers/ViewController.php @@ -83,10 +83,10 @@ class Bulletin_ViewController extends Requests_ViewController $this->view->proposedFileContents = Bulletin_SectionModel::getBodyHtml($this->view->proposedFileContents); $dom = new DOMDocument(); - $dom -> loadHTML($this->view->proposedFileContents); - $xml = simplexml_import_dom($dom); - $this->view->quickPoints = Bulletin_UtilityModel::parseQuickPoints($xml); - + if($dom -> loadHTML($this->view->proposedFileContents)){ + $xml = simplexml_import_dom($dom); + $this->view->quickPoints = Bulletin_UtilityModel::parseQuickPoints($xml); + } $this->view->proposedFileContents = UNL_UndergraduateBulletin_EPUB_Utilities::format($this->view->proposedFileContents); $this->view->proposedFileContents = preg_replace('/href=".+?"/', 'href="#"', $this->view->proposedFileContents); diff --git a/application/modules/bulletin/views/scripts/view/index.phtml b/application/modules/bulletin/views/scripts/view/index.phtml index 4cd7d4c7f7b54182f9774c26d81286a3e762b81e..d6cbec6c55997a047a6ec4689d1e79a53e44fcb3 100644 --- a/application/modules/bulletin/views/scripts/view/index.phtml +++ b/application/modules/bulletin/views/scripts/view/index.phtml @@ -17,7 +17,7 @@ $proposedSection = Bulletin_SectionModel::parseHtml($this->proposedFileContents, <div id="decisionMessage"><?php echo $this->decisionMessage;?></div> <?php } ?> -<a href="/bulletin/view/preview/id/<?php echo $this->id; ?>" target="_blank">Preview Bulletin Page</a> +<a href="/bulletin/view/preview/id/<?php echo $this->request->getId(); ?>" target="_blank">Preview Bulletin Page</a> <div class="wdn-grid-set-halves"> <div class="current wdn-col"> diff --git a/application/modules/bulletin/views/scripts/view/list.phtml b/application/modules/bulletin/views/scripts/view/list.phtml index e1a91cea7d696ce7b2eb923e00d855268b55d4ca..4c366f1939f190996f76dbf35661bba0f2592b92 100644 --- a/application/modules/bulletin/views/scripts/view/list.phtml +++ b/application/modules/bulletin/views/scripts/view/list.phtml @@ -1,6 +1,6 @@ <?php $this->headScript()->appendFile($this->baseUrl() . '/javascript/bulletin/new.js'); -$this->layout()->pageTitle = 'New Bulletin Request'; +$this->layout()->pageTitle = 'Search Bulletin'; ?> <?php if ($this->messages) { ?>