修复已知bug

MoePlayer · Jun 3, 2016 · b06244f · b06244f
1 parent 098b0e4
commit b06244f
Showing 1 changed file with 37 additions and 32 deletions.
diff --git a/function.php b/function.php
@@ -5,41 +5,46 @@ function parseCallback($post,$siteurl,$dmserver,$theme) {
         $pattern = self::get_shortcode_regex(array('dplayer'));
         preg_match_all("/$pattern/",$post,$matches);
         if (empty($matches[0])) {
-            return $post;
-        }
-        if ($matches[1] == '[' && $matches[6] == ']') {
-            return substr($matches[0], 1, -1);
+            return $post."<i id=\"dpajax\" hidden=\"hidden\"></i>";
         }
         for ($i=0;$i<count($matches[3]);$i++) {
-            $attr = htmlspecialchars_decode($matches[3][$i]);
-            $atts = self::shortcode_parse_atts($attr);
-            $id = md5($siteurl.$atts['url']);
-            $result = array(
-                'url' => $atts['url'] ? $atts['url'] : '',
-                'pic' => $atts['pic'] ? $atts['pic'] : '');
-            if (empty($result)) return '';
-            if (empty($theme)) $theme = '#FADFA3';
-            $data = array(
-                'id' => $id,
-                'autoplay' => false,
-                'theme' => $theme);
-            $data['autoplay'] = ($atts['autoplay'] == 'true') ? true : false;
-            $data['theme'] = $atts['theme'] ? $atts['theme'] : $theme;
-            $data['video'] = $result;
-            $danmaku = array(
-                'id' => md5($id),
-                'token' => md5(md5($id) . date('YmdH', time())),
-                'api' => $dmserver,);
-            $data['danmaku'] = ($atts['danmu'] != 'false') ? $danmaku : null;
-            if (empty($dmserver)) $data['danmaku'] = null;
-            $js = json_encode($data);
-            $src = "<div id=\"player".$id."\" class=\"dplayer\"></div>";
-            if (empty($out)) {
-                $out = str_replace($matches[0][$i], $src, $post);
-                $jssrc = "dPlayerOptions.push(".$js.");";
+            if ($matches[1][$i] == '[' && $matches[6][$i] == ']') {
+                if (empty($out)) {
+                    $out = str_replace($matches[0][$i], substr($matches[0][$i], 1, -1), $post);
+                } else {
+                    $out = str_replace($matches[0][$i], substr($matches[0][$i], 1, -1), $out);
+                }
             } else {
-                $out = str_replace($matches[0][$i], $src, $out);
-                $jssrc .= "dPlayerOptions.push(".$js.");";
+                $attr = htmlspecialchars_decode($matches[3][$i]);
+                $atts = self::shortcode_parse_atts($attr);
+                $id = md5($siteurl.$atts['url']);
+                $result = array(
+                    'url' => $atts['url'] ? $atts['url'] : '',
+                    'pic' => $atts['pic'] ? $atts['pic'] : '');
+                if (empty($result)) return '';
+                if (empty($theme)) $theme = '#FADFA3';
+                $data = array(
+                    'id' => $id,
+                    'autoplay' => false,
+                    'theme' => $theme);
+                $data['autoplay'] = ($atts['autoplay'] == 'true') ? true : false;
+                $data['theme'] = $atts['theme'] ? $atts['theme'] : $theme;
+                $data['video'] = $result;
+                $danmaku = array(
+                    'id' => md5($id),
+                    'token' => md5(md5($id) . date('YmdH', time())),
+                    'api' => $dmserver,);
+                $data['danmaku'] = ($atts['danmu'] != 'false') ? $danmaku : null;
+                if (empty($dmserver)) $data['danmaku'] = null;
+                $js = json_encode($data);
+                $src = "<div id=\"player".$id."\" class=\"dplayer\"></div>";
+                if (empty($out)) {
+                    $out = str_replace($matches[0][$i], $src, $post);
+                    $jssrc = "dPlayerOptions.push(".$js.");";
+                } else {
+                    $out = str_replace($matches[0][$i], $src, $out);
+                    $jssrc .= "dPlayerOptions.push(".$js.");";
+                }
             }
         }
         $out .= "<i id=\"dpajax\" hidden=\"hidden\">".$jssrc."</i>";