1
0
mirror of https://github.com/e107inc/e107.git synced 2025-02-15 03:54:39 +01:00

Merge remote-tracking branch 'origin/master'

This commit is contained in:
SecretR 2013-05-24 22:43:46 +03:00
commit 1828e88a0d

View File

@ -188,6 +188,7 @@ if ($action == 'cat' || $action == 'all' || vartrue($_GET['tag']))
elseif(vartrue($_GET['tag']))
{
$tagsearch = preg_replace('#[^a-zA-Z0-9\-]#','', $_GET['tag']);
if(!defined("NEWSLIST_LIMIT")) { define("NEWSLIST_LIMIT",10); }
$query = "
SELECT n.*, u.user_id, u.user_name, u.user_customtitle, nc.category_id, nc.category_name, nc.category_sef, nc.category_icon, nc.category_meta_keywords,
nc.category_meta_description
@ -1072,4 +1073,4 @@ function setNewsFrontMeta($news, $type='news')
}
?>
?>