Changeset 451 for branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php

Timestamp:

Nov 20, 2009, 2:52:16 PM (14 years ago)

Author:

toemon

Message:

MUブランチにVer2.2.0RC1の変更内容をマージ

File:

• branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php (modified) (1 diff)

branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php

@@ -792 +792 @@
 
         $week_begins = intval(get_option('start_of_week'));
-        $head_pattrn = '<thead>\s*<tr>\s*(<th[^>]*>.*<\/th>)\s*(<th[^>]*>.*<\/th>)\s*(<th[^>]*>.*<\/th>)\s*(<th[^>]*>.*<\/th>)\s*(<th[^>]*>.*<\/th>)\s*(<th[^>]*>.*<\/th>)\s*(<th[^>]*>.*<\/th>)\s*<\/tr>\s*<\/thead>';
+        $head_pattrn = '<thead>\s*<tr>\s*(<th[^>]*>[^<]*<\/th>)\s*(<th[^>]*>[^<]*<\/th>)\s*(<th[^>]*>[^<]*<\/th>)\s*(<th[^>]*>[^<]*<\/th>)\s*(<th[^>]*>[^<]*<\/th>)\s*(<th[^>]*>[^<]*<\/th>)\s*(<th[^>]*>[^<]*<\/th>)\s*<\/tr>\s*<\/thead>';
         if(preg_match('/'. $head_pattrn . '/s' ,$calendar,$head_match)){
                 $sun_index = 1 - $week_begins;