disinclined.org
/
git
/
dylansserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f9f5098
)
Fixed comment display broken from merge
author
Dylan Lloyd
<dylan@psu.edu>
Thu, 10 Mar 2011 21:37:06 +0000
(16:37 -0500)
committer
Dylan Lloyd
<dylan@psu.edu>
Thu, 10 Mar 2011 21:37:06 +0000
(16:37 -0500)
index.php
patch
|
blob
|
history
diff --git
a/index.php
b/index.php
index
bbd2254
..
7feaa03
100644
(file)
--- a/
index.php
+++ b/
index.php
@@
-182,9
+182,9
@@
OTHER_PROJECTS;
// Because of the CSS necessary for the animations,
// the contact link needs to be in #portfolio to clear
// the floats.
// Because of the CSS necessary for the animations,
// the contact link needs to be in #portfolio to clear
// the floats.
-
echo "<li>";
+ echo "<li>";
$this->display_contact();
$this->display_contact();
-
echo "</li>";
+ echo "</li>";
echo "</ul>";
$this->display_close($show_contact = false);
}
echo "</ul>";
$this->display_close($show_contact = false);
}
@@
-450,6
+450,11
@@
END_OF_NAVIGATION;
$author = $entry['author'];
$email = $entry['email'];
$text = htmlspecialchars($entry['text']);
$author = $entry['author'];
$email = $entry['email'];
$text = htmlspecialchars($entry['text']);
+ if ($email == '') {
+ $head = "<h3>$author</h3>";
+ } else {
+ $head = "<h3><a href='mailto:$email'>$author</a></h3>";
+ }
echo <<<END_OF_COMMENT
<div class='comment'>
$head
echo <<<END_OF_COMMENT
<div class='comment'>
$head
@@
-565,7
+570,7
@@
class archive extends cms {
AND DAY(date_posted) = ?
ORDER BY date_posted DESC";
$result = $this->query($sql, "ddd",
AND DAY(date_posted) = ?
ORDER BY date_posted DESC";
$result = $this->query($sql, "ddd",
-
$_GET['year'], $_GET['month'],
+ $_GET['year'], $_GET['month'],
$_GET['day']);
break;
}
$_GET['day']);
break;
}
@@
-581,8
+586,8
@@
class archive extends cms {
$day_posted = $datetime_posted[0];
echo "<div class='note'>";
echo "<h2><span style='color:grey;'>";
$day_posted = $datetime_posted[0];
echo "<div class='note'>";
echo "<h2><span style='color:grey;'>";
-
echo "$year_posted/$month_posted/$day_posted/";
-
echo "</span><a href='$url'>$title</a></h2>";
+ echo "$year_posted/$month_posted/$day_posted/";
+ echo "</span><a href='$url'>$title</a></h2>";
echo $entry['text'];
echo "</div>";
}
echo $entry['text'];
echo "</div>";
}