Merge branch 'master' into prod

shi-yang · Jul 20, 2015 · 6debe96 · 6debe96
2 parents 10ea848 + dc9728c
commit 6debe96
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/common/widgets/laydate/LayDateAsset.php b/common/widgets/laydate/LayDateAsset.php
@@ -12,7 +12,7 @@
  */
 class LayDateAsset extends AssetBundle
 {
-    public $sourcePath = '@common/widgets/Laydate/assets';
+    public $sourcePath = '@common/widgets/laydate/assets';
 
     public $js = [
         'laydate.js',

diff --git a/frontend/themes/basic/modules/user/views/setting/profile.php b/frontend/themes/basic/modules/user/views/setting/profile.php
@@ -17,7 +17,7 @@
 
         <?= $form->field($profile, 'gender')->radioList([Yii::t('app', 'Male'), Yii::t('app', 'Female')]) ?>
 
-        <?= $form->field($profile, 'birthdate')->widget('common\widgets\layDate\LayDate', [
+        <?= $form->field($profile, 'birthdate')->widget('common\widgets\laydate\LayDate', [
             'clientOptions' => [
                 'istoday' => false,
             ]

diff --git a/vendor/shiyang/yii2-umeditor/UMeditor.php b/vendor/shiyang/yii2-umeditor/UMeditor.php
@@ -64,7 +64,7 @@ public function run()
 	protected function registerClientScript()
 	{
 		$view = $this->getView();
-		UmeditorAsset::register($view);
+		UMeditorAsset::register($view);
 		$id = $this->options['id'];
 		$options = Json::encode($this->clientOptions);
 		$js = "window.um = UM.getEditor('$id', $options);";