From a047757fef805ab37607c715886ce439e85ab23d Mon Sep 17 00:00:00 2001 From: Cameron Date: Sun, 22 Nov 2015 09:00:08 -0800 Subject: [PATCH] Fixes #1241, Fixes #1121 - Duplicate SEF warning added to news. --- e107_admin/newspost.php | 12 ++++++++++++ e107_languages/English/admin/lan_newspost.php | 1 + 2 files changed, 13 insertions(+) diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php index e75b1d356..b9740928a 100644 --- a/e107_admin/newspost.php +++ b/e107_admin/newspost.php @@ -508,6 +508,12 @@ class news_admin_ui extends e_admin_ui e107::getDb()->update('submitnews', "submitnews_auth = 1 WHERE submitnews_id = ".intval($new_data['submitted_id'])." LIMIT 1"); } + if(!empty($new_data['news_sef']) && ($existingSef = e107::getDb()->retrieve('news', 'news_sef', "news_sef = '".$new_data['news_sef']."' AND news_id != ".$id))) + { + $existingLAN = e107::getParser()->lanVars(LAN_NEWS_95,$existingSef,true ); + e107::getMessage()->addWarning($existingLAN); + } + $this->processPings(); e107::getEvent()->trigger('newspost',$new_data); @@ -536,6 +542,12 @@ class news_admin_ui extends e_admin_ui $this->clearCache(); + if(!empty($new_data['news_sef']) && ($existingSef = e107::getDb()->retrieve('news', 'news_sef', "news_sef = '".$new_data['news_sef']."' AND news_id != ".$id))) + { + $existingLAN = e107::getParser()->lanVars(LAN_NEWS_95,$existingSef,true ); + e107::getMessage()->addWarning($existingLAN); + } + //$ecache->clear("nq_news_"); - supported by cache::clear() now //$ecache->clear("nomd5_news_"); supported by cache::clear() now diff --git a/e107_languages/English/admin/lan_newspost.php b/e107_languages/English/admin/lan_newspost.php index c0b9f73e1..6105052d4 100644 --- a/e107_languages/English/admin/lan_newspost.php +++ b/e107_languages/English/admin/lan_newspost.php @@ -218,5 +218,6 @@ define("LAN_NEWS_91", "List-view limit per page"); define("LAN_NEWS_92", "eg. news.php?all or news.php?cat.1 or news.php?tag=xxx"); define("LAN_NEWS_93", "List-view content"); define("LAN_NEWS_94", "Items assigned to these templates will be displayed in the list."); +define("LAN_NEWS_95", "Another news item is using the SEF URL: [x]"); ?> \ No newline at end of file