shorten urls for posts > 140 chars only, from anywhere. Only show long urls in title attributes for links we shortened ourselves.

darcs-hash:20081128210114-099f7-4e4cde0a983c2ac6d41efb59b46cb7dbf45dc7a6.gz

1 files changed, 5 insertions, 5 deletions

diff --git a/actions/newnotice.php b/actions/newnotice.php
index a79d0a1a2..932099c60 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -51,11 +51,11 @@ class NewnoticeAction extends Action {
 			$this->show_form(_('No content!'));
 			return;
 		} else {
-			$content = common_shorten_links($content);
+			$content_shortened = common_shorten_links($content);
 
-			if (mb_strlen($content) > 140) {
-				common_debug("Content = '$content'", __FILE__);
-				common_debug("mb_strlen(\$content) = " . mb_strlen($content), __FILE__);
+			if (mb_strlen($content_shortened) > 140) {
+				common_debug("Content = '$content_shortened'", __FILE__);
+				common_debug("mb_strlen(\$content) = " . mb_strlen($content_shortened), __FILE__);
 				$this->show_form(_('That\'s too long. Max notice size is 140 chars.'));
 				return;
 			}
@@ -63,7 +63,7 @@ class NewnoticeAction extends Action {
 
 		$inter = new CommandInterpreter();
 
-		$cmd = $inter->handle_command($user, $content);
+		$cmd = $inter->handle_command($user, $content_shortened);
 
 		if ($cmd) {
 			$cmd->execute(new WebChannel());