fixed

ytake · Sep 10, 2014 · 5565512 · 5565512
1 parent 3b19385
commit 5565512
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/App/Controllers/BaseController.php b/app/App/Controllers/BaseController.php
@@ -45,7 +45,7 @@ protected function title($string = null)
     {
         $title = ($string) ? " | $string" : null;
         $title = \Config::get('recipe.title') . $title;
-        \View::inject('title', $title);
+        \View::inject('title', e(str_replace(["\r\n","\r","\n"], '', $title)));
     }
 
     /**
@@ -56,7 +56,7 @@ protected function description($string = null)
     {
         $description = ($string) ? " | $string" : null;
         $description = \Config::get('recipe.description_prefix') . $description . " レシピ";
-        \View::inject('description', $description);
+        \View::inject('description', e(str_replace(["\r\n","\r","\n"], '', $description)));
     }
 
     /**

diff --git a/app/views/home/faq/index.blade.php b/app/views/home/faq/index.blade.php
@@ -14,7 +14,7 @@
                 <h3 class="text-danger"><span class="glyphicon glyphicon-ok"></span>&nbsp;レシピについての質問</h3>
                 <h4><span class="glyphicon glyphicon-chevron-right"></span>&nbsp;簡単なレシピばっかり？</h4>
                 <p>
-                    多くは書学者向けのものである場合が多いですが、日本で独自に追加したレシピ以外は、<br />
+                    多くはビギナー向けのものである場合が多いですが、日本で独自に追加したレシピ以外は、<br />
                     基本的には原文を翻訳したものになっています(意訳含む)<br />
                     こんなレシピが欲しい！という方は気軽にご連絡を頂けると助かります
                 </p>

diff --git a/app/views/layouts/default.blade.php b/app/views/layouts/default.blade.php
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
-<html lang="ja" prefix="og: http://ogp.me/ns#">
-<head>
+<html lang="ja">
+<head prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb# article: http://ogp.me/ns/article#">
     <meta charset="utf-8">
     <meta http-equiv="x-dns-prefetch-control" content="on">
     <meta name="robots" content="index">