Merge branch 'develop'

@@ -59,12 +59,12 @@ class Service_News extends Lib_Service
        		$exceptWhere = " `tag` NOT IN ('$exceptTags') ";
        }
        if ($tag)
-       {      
+       {
        	   $tag = strip_tags($tag);
            $tag = addslashes($tag);
            $where = '`tag` like ("'.$tag.'%")' ;
        }
-       $where = ' WHERE '.$where .' AND '.$exceptWhere;
+       $where = ' WHERE '.$where .' OR is_video=1 AND '.$exceptWhere;
        return self::service(self::ROUTER)->tag(self::$_tag)->fetchOne('getTotal', array(),array('where' => $where));
     }