From c56715ceaf951e8c1e6a5fd7058b7547993fd292 Mon Sep 17 00:00:00 2001 From: ahilles107 Date: Mon, 7 Apr 2014 16:16:45 +0200 Subject: [PATCH] link service fix, missing pl language in text box --- newscoop/js/tinymce/plugins/textbox/langs/pl.js | 7 +++++++ newscoop/library/Newscoop/Article/LinkService.php | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 newscoop/js/tinymce/plugins/textbox/langs/pl.js diff --git a/newscoop/js/tinymce/plugins/textbox/langs/pl.js b/newscoop/js/tinymce/plugins/textbox/langs/pl.js new file mode 100644 index 0000000000..73747dbb7e --- /dev/null +++ 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 index 27b7cc89c9..beef2ba685 100644 --- 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; }