[Affelio-cvs 1118] CVS update: affelio/apps/diary/Diary

Back to archive index

Yoshihisa Fukuhara higef****@users*****
2006年 3月 3日 (金) 21:39:50 JST


Index: affelio/apps/diary/Diary/ShowTb.pm
diff -u affelio/apps/diary/Diary/ShowTb.pm:1.1 affelio/apps/diary/Diary/ShowTb.pm:1.2
--- affelio/apps/diary/Diary/ShowTb.pm:1.1	Wed Mar  1 14:40:35 2006
+++ affelio/apps/diary/Diary/ShowTb.pm	Fri Mar  3 21:39:50 2006
@@ -81,7 +81,7 @@
 		TITLE		=> $diary->escape($_->{title}),
 		BLOG_NAME	=> $diary->escape($_->{blog_name}),
 		URL		=> $_->{url},
-		EXCERPT		=> $diary->escape($_->{excerpt}),
+		EXCERPT		=> $_->{excerpt},
 		DATE		=> "$year/$mon/$mday $hour:$min",
 	    };
 	}
@@ -99,12 +99,7 @@
 	my $diary = shift;
 	my $id   = shift;
 	my @ret  = $diary->getall("SELECT * FROM $diary->{tb_table} WHERE id = $id");
-	
-	foreach (@ret) {
-		$_->{excerpt} = Jcode::convert($_->{excerpt}, 'utf8');
-	}
-	reset (@ret);
-
+#	reset (@ret);
 	return @ret;
 }
 
Index: affelio/apps/diary/Diary/WriteDiary.pm
diff -u affelio/apps/diary/Diary/WriteDiary.pm:1.7 affelio/apps/diary/Diary/WriteDiary.pm:1.8
--- affelio/apps/diary/Diary/WriteDiary.pm:1.7	Fri Mar  3 20:54:03 2006
+++ affelio/apps/diary/Diary/WriteDiary.pm	Fri Mar  3 21:39:50 2006
@@ -251,6 +251,7 @@
     use utf8;
     my ($diary, $url, $title, $contents, $id) = @_;
     $id = $diary->getColumn("SELECT MAX(id) FROM $diary->{entry_table}") unless ($id);
+    $contents =~ s/<image="([A-Za-z0-9\-\_]*\.(jpg|png|gif|bmp|jpeg))">//ig;
     my %form = (
 	title => $title, 
 	excerpt => substr($diary->br2n($contents),0,50),


Affelio-cvs メーリングリストの案内
Back to archive index