From 8a4012d893bcd5575330ec769e1f3250c6463b1c Mon Sep 17 00:00:00 2001
From: METO <i@i-meto.com>
Date: Sun, 2 Jul 2017 15:25:22 +0800
Subject: [PATCH] =?UTF-8?q?[1.2.1]=20=E4=BF=AE=E5=A4=8D=E4=BA=91=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90=E5=BC=80=E5=85=B3=E5=A4=B1=E6=95=88=E7=9A=84=20:bug:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Action.php |  3 ++-
 Plugin.php | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Action.php b/Action.php
index 323c751..2dd8e8c 100644
--- a/Action.php
+++ b/Action.php
@@ -80,6 +80,7 @@ class Meting_Action extends Typecho_Widget implements Widget_Interface_Do {
     }
 
     private function musicjs(){
+        if(!extension_loaded('Meting'))include_once 'include/Meting.php';
         self::filterReferer();
         $PID=$this->request->get('id');
         $data=$this->request->get('d');
@@ -103,7 +104,7 @@ class Meting_Action extends Typecho_Widget implements Widget_Interface_Do {
             'preload'  => $setting['preload']?:Typecho_Widget::widget('Widget_Options')->plugin('Meting')->preload?:'auto',
             'autoplay' => $setting['autoplay']?:Typecho_Widget::widget('Widget_Options')->plugin('Meting')->autoplay?:'false',
             'height'   => $setting['height']?:Typecho_Widget::widget('Widget_Options')->plugin('Meting')->height?:'340px',
-            'mode'   => $setting['mode']?:Typecho_Widget::widget('Widget_Options')->plugin('Meting')->mode?:'circulation',
+            'mode'     => $setting['mode']?:Typecho_Widget::widget('Widget_Options')->plugin('Meting')->mode?:'circulation',
             'music'    => array(),
         );
         foreach($music as $vo){
diff --git a/Plugin.php b/Plugin.php
index 7d1814c..11d6818 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -6,13 +6,13 @@ if(!defined('__TYPECHO_ROOT_DIR__'))exit;
  *
  * @package Meting
  * @author METO
- * @version 1.2.0
+ * @version 1.2.1
  * @dependence 14.10.10-*
  * @link https://github.com/metowolf/Meting-Typecho-Plugin
  *
  */
 
-define('METING_VERSION','1.2.0');
+define('METING_VERSION','1.2.1');
 
 class Meting_Plugin extends Typecho_Widget implements Typecho_Plugin_Interface
 {
@@ -107,14 +107,14 @@ class Meting_Plugin extends Typecho_Widget implements Typecho_Plugin_Interface
         $ver=METING_VERSION;
         echo "<!-- Meting Start -->\n";
         echo "<script type=\"text/javascript\" src=\"{$dir}APlayer.min.js?v={$ver}\"></script>\n";
-        if(Typecho_Widget::widget('Widget_Options')->plugin('Meting')->cloudapi){
+        if(Typecho_Widget::widget('Widget_Options')->plugin('Meting')->cloudapi=='true'){
             echo "<script src=\"https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js\"></script>\n";
         }
         echo "<!-- Meting End -->\n";
     }
 
     public static function footer(){
-        if(Typecho_Widget::widget('Widget_Options')->plugin('Meting')->cloudapi){
+        if(Typecho_Widget::widget('Widget_Options')->plugin('Meting')->cloudapi=='true'){
             echo "<script type=\"text/javascript\" src=\"https://api.i-meto.com/music/player.js?v={$ver}\"></script>\n";
         }
     }
@@ -151,7 +151,7 @@ class Meting_Plugin extends Typecho_Widget implements Typecho_Plugin_Interface
         }
         $id=self::getPID();
         $dir=Typecho_Common::url('MetingAPI',Helper::options()->index);
-        if(Typecho_Widget::widget('Widget_Options')->plugin('Meting')->cloudapi){
+        if(Typecho_Widget::widget('Widget_Options')->plugin('Meting')->cloudapi=='true'){
             $str="<div class=\"aplayer\" data-id=\"{$data[0]['id']}\" data-server=\"{$data[0]['server']}\" data-type=\"{$data[0]['type']}\"";
             $player=array(
                 'theme'    => $setting['theme']?:Typecho_Widget::widget('Widget_Options')->plugin('Meting')->theme?:'red',