diff --git a/phpdotnet/phd/Package/Generic/TocFeed.php b/phpdotnet/phd/Package/Generic/TocFeed.php
index d95b97be..f6a85f48 100644
--- a/phpdotnet/phd/Package/Generic/TocFeed.php
+++ b/phpdotnet/phd/Package/Generic/TocFeed.php
@@ -364,7 +364,7 @@ protected function createAtomToc($id)
             if ($long && $short && $long != $short) {
                 $title = $short . ' -- ' . $long;
             } else {
-                $title = ($long ?: $short);
+                $title = $long;
             }
             $link = $this->createTargetLink($chunkid);
             $toc .= <<<ATM
diff --git a/phpdotnet/phd/Package/Generic/XHTML.php b/phpdotnet/phd/Package/Generic/XHTML.php
index 26413db5..59beca28 100644
--- a/phpdotnet/phd/Package/Generic/XHTML.php
+++ b/phpdotnet/phd/Package/Generic/XHTML.php
@@ -575,7 +575,7 @@ protected function createTOC($id, $name, $props, $depth = 1, $header = true) {
             if ($isLDesc && $isSDesc) {
                 $toc .= '<li><a href="' . $link . '">' . $short . '</a> — ' . $long . $list . "</li>\n";
             } else {
-                $toc .= '<li><a href="' . $link . '">' . ($long ? $long : $short) . '</a>' . $list .  "</li>\n";
+                $toc .= '<li><a href="' . $link . '">' . $long . '</a>' . $list .  "</li>\n";
             }
         }
         $toc .= "</ul>\n";
diff --git a/phpdotnet/phd/Package/PEAR/Web.php b/phpdotnet/phd/Package/PEAR/Web.php
index 4e6f5916..7f885f8b 100755
--- a/phpdotnet/phd/Package/PEAR/Web.php
+++ b/phpdotnet/phd/Package/PEAR/Web.php
@@ -71,10 +71,9 @@ public function header($id)
         $siblingIDs = Format::getChildren($parent);
         foreach ($siblingIDs as $sid) {
             $sdesc = Format::getShortDescription($sid);
-            $ldesc = Format::getLongDescription($sid);
             $toc[] = array(
                 $sid . $ext,
-                empty($sdesc) ? $ldesc : $sdesc
+                $sdesc
             );
         }
 
diff --git a/phpdotnet/phd/Package/PHP/XHTML.php b/phpdotnet/phd/Package/PHP/XHTML.php
index 823785d2..16fc41b9 100644
--- a/phpdotnet/phd/Package/PHP/XHTML.php
+++ b/phpdotnet/phd/Package/PHP/XHTML.php
@@ -962,7 +962,7 @@ public function format_root_chunk($open, $name, $attrs) {
             if ($long && $short && $long != $short) {
                 $content .= '<li><a href="' .$href. '">' .$short. '</a> — ' .$long;
             } else {
-                $content .= '<li><a href="' .$href. '">' .($long ? $long : $short). '</a>';
+                $content .= '<li><a href="' .$href. '">' . $long . '</a>';
             }
             $children = Format::getChildren($chunkid);
             if (count($children)) {
@@ -974,7 +974,7 @@ public function format_root_chunk($open, $name, $attrs) {
                     if ($long && $short && $long != $short) {
                         $content .= '<li><a href="' .$href. '">' .$short. '</a> — ' .$long. '</li>';
                     } else {
-                        $content .= '<li><a href="' .$href. '">' .($long ? $long : $short). '</a></li>';
+                        $content .= '<li><a href="' .$href. '">' . $long . '</a></li>';
                     }
                 }
                 $content .="</ul>";