[php-blog-cvs] serendipity serendipity_functions.inc.php,1.377,1.378

[Kristian K. <is...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11457

Modified Files:
	serendipity_functions.inc.php 
Log Message:
- If top_as_links is false, (Link) is no longer suppressed, but shown as text
- Added translation requests where appropriate


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -d -r1.377 -r1.378
--- serendipity_functions.inc.php	28 Jul 2004 19:18:07 -0000	1.377
+++ serendipity_functions.inc.php	28 Jul 2004 19:30:11 -0000	1.378
@@ -1600,13 +1600,17 @@
                 echo htmlspecialchars($name);
             }
 
-            /* Link to the user's website, if the URL is valid */
+            /* Create a link or plain text depending on spam control settings */
             $showlink = serendipity_get_config_var('top_as_links', true);
             if ($showlink === true) {
                 $linktext = ' (<a href="' . str_replace('"', '&quot;', $comment['url']) . '" ' . serendipity_xhtml_target('_blank') . ' title="' . htmlspecialchars($comment['url']) . '">Link</a>)';
+            } else {
+                $linktext = ' (' . htmlspecialchars($comment['url']) . ") ";
             }
-            if (($showlink === true) && (!isset($comment['type']) || $comment['type'] != 'trackback') && !empty($comment['url']) && $comment['url'] != 'http://' && eregi('^https?://', $comment['url'])) {
-                echo ' (<a href="' . str_replace('"', '&quot;', $comment['url']) . '" ' . serendipity_xhtml_target('_blank') . ' title="' . htmlspecialchars($comment['url']) . '">Link</a>)';
+
+            /* Link to the user's website only if the URL is valid */
+            if ((!isset($comment['type']) || $comment['type'] != 'trackback') && !empty($comment['url']) && $comment['url'] != 'http://' && eregi('^https?://', $comment['url'])) {
+                echo $linktext;
             }
 
             /* Show when the entry was made */