diff --git a/web/admin/problem_list.php b/web/admin/problem_list.php
index 063e8b9..fc13b7b 100644
--- a/web/admin/problem_list.php
+++ b/web/admin/problem_list.php
@@ -105,7 +105,7 @@ if(isset($_GET['keyword']) && $_GET['keyword']!=""){
 		echo "<td>";//分类
 		
 		$category = array();
-	    $cate = explode(" ",$row['source']);
+	    $cate = preg_split('/[\s,]+/',$row['source']);
 	    foreach($cate as $cat){
                         $cat=trim($cat);
                         if(mb_ereg("^http",$cat)){
diff --git a/web/category.php b/web/category.php
index 01f7f5f..d521e70 100644
--- a/web/category.php
+++ b/web/category.php
@@ -18,7 +18,7 @@
 	$result=mysql_query_cache($sql);//mysql_escape_string($sql));
 	$category=array();
         foreach ($result as $row){
-		$cate=explode(" ",$row['source']);
+		$cate=preg_split('/[\s,]+/',$row['source']);
 		foreach($cate as $cat){
                         $cat=trim($cat);
                         if(mb_ereg("^http",$cat)){
diff --git a/web/portal.php b/web/portal.php
index d6e2028..039f52d 100644
--- a/web/portal.php
+++ b/web/portal.php
@@ -42,7 +42,7 @@ foreach ($result as $row) {
 		$view_problemset[$i][0] = "<div class=none> </div>";
 	}
 	$category = array();  
-	$cate = explode(" ",$row['source']);  //分类标签
+	$cate = preg_split('/[\s,]+/',$row['source']);  //分类标签
 	foreach($cate as $cat){
                         $cat=trim($cat);
                         if(mb_ereg("^http",$cat)){
diff --git a/web/problemset.php b/web/problemset.php
index 1198418..8ee818b 100644
--- a/web/problemset.php
+++ b/web/problemset.php
@@ -146,7 +146,7 @@ foreach ($result as $row) {
 	}
 
 	$category = array();
-	$cate = explode(" ", $row['source']);
+	$cate = preg_split('/[\s,]+/', $row['source']);
 	foreach ($cate as $cat) {
 		$cat = trim($cat);
 		if (mb_ereg("^http", $cat)) {
diff --git a/web/template/syzoj/problem.php b/web/template/syzoj/problem.php
index 0da7d57..8963c79 100644
--- a/web/template/syzoj/problem.php
+++ b/web/template/syzoj/problem.php
@@ -428,7 +428,7 @@ if ($pr_flag) {
     $tcolor = 0;
     ?>
     <?php if ($row['source'] && !isset($_GET['cid'])) {
-      $cats = explode(" ", $row['source']);
+      $cats = preg_split('/[\s,]+/', $row['source']);
       ?>
       <div class="row">
         <div class="column">