diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php index ea0378fc7..8affaab65 100644 --- a/e107_admin/newspost.php +++ b/e107_admin/newspost.php @@ -528,8 +528,7 @@ class admin_newspost switch ($delete) { case 'main': - //clear rewrite cache - + if ($e107->sql->db_Count('news','(*)',"WHERE news_id={$del_id}")) { e107::getEvent()->trigger("newsdel", $del_id); @@ -548,7 +547,7 @@ class admin_newspost break; case 'category': - //clear rewrite cache + if(!getperms('0|7')) $this->noPermissions(); @@ -689,10 +688,10 @@ class admin_newspost $this->error = true; } - if(!empty($_POST['news_rewrite_string']) && preg_match('#[^\w\pL\-]#u', $_POST['news_rewrite_string'])) + // if(!empty($_POST['news_rewrite_string']) && preg_match('#[^\w\pL\-]#u', $_POST['news_rewrite_string'])) { - $this->show_message('Validation Error: Bad value for Category friendly URL', E_MESSAGE_ERROR); - $this->error = true; + // $this->show_message('Validation Error: Bad value for Category friendly URL', E_MESSAGE_ERROR); + // $this->error = true; } if (!$this->error) @@ -2074,17 +2073,14 @@ class admin_newspost $frm = e107::getForm(false, true); $category = array(); - $category_rewrite = array(); + if ($this->getSubAction() == "edit" && !isset($_POST['update_category'])) { if (e107::getDb()->db_Select("news_category", "*", "category_id=".$this->getId())) { $category = e107::getDb()->db_Fetch(); } - if($category && e107::getDb()->db_Select('news_rewrite', '*', 'news_rewrite_source='.$this->getId().' AND news_rewrite_type=2')) - { - $category_rewrite = e107::getDb()->db_Fetch(); - } + } if($this->error && (isset($_POST['update_category']) || isset($_POST['create_category']))) @@ -2122,14 +2118,19 @@ class admin_newspost ".$frm->text('category_name', $category['category_name'], 200)."