Merge pull request #624 from ahilles107/fixes

link service fix, missing pl language in text box
sourcefabric · Apr 7, 2014 · b8a60cc · b8a60cc
2 parents fa26613 + c56715c
commit b8a60cc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/newscoop/js/tinymce/plugins/textbox/langs/pl.js b/newscoop/js/tinymce/plugins/textbox/langs/pl.js
@@ -0,0 +1,7 @@
+// UK lang variables
+tinyMCE.addI18n('en.textbox',{
+textbox_desc : "Text Box",
+textbox_title : "Text Box",
+textbox_pagecode : "Wklej/Wpisz swój teks tutaj",
+textbox_button_desc: "Wstaw"
+});
diff --git a/newscoop/library/Newscoop/Article/LinkService.php b/newscoop/library/Newscoop/Article/LinkService.php
@@ -216,9 +216,11 @@ public function getSeo($article, array $fields)
                     break;
 
                 case 'topics':
-                    $topics = \ArticleTopic::GetArticleTopics($article->getNumber());
-                    foreach ($articleTopics as $topic) {
-                        $seo[] = trim($topic->getName($article->getLanguageId()));
+                    $articleTopics = \ArticleTopic::GetArticleTopics($article->getNumber());
+                    if (is_array($articleTopics)) {
+                        foreach ($articleTopics as $topic) {
+                            $seo[] = trim($topic->getName($article->getLanguageId()));
+                        }
                     }
                     break;
             }