Merge pull request #1094 from nobuhiko/fixed_issue_355

カレンダーもcomposerに変更
EC-CUBE · Dec 20, 2024 · b083b10 · b083b10
2 parents 46e5e42 + a8ba284
commit b083b10
Show file tree

Hide file tree

Showing 27 changed files with 55 additions and 5,837 deletions.
diff --git a/composer.json b/composer.json
@@ -39,6 +39,7 @@
         "mobiledetect/mobiledetectlib": "^3.74",
         "nanasess/mdb2": "^2.5",
         "nanasess/php8-compat": "^1.0",
+        "nobuhiko/calendar": "^1.0",
         "pear/archive_tar": "^1.4.3",
         "pear/mail": "*",
         "pear/net_smtp": "^1.12",

diff --git a/composer.lock b/composer.lock
diff --git a/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php b/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php
@@ -21,8 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-defined('CALENDAR_ROOT') || define('CALENDAR_ROOT', DATA_REALDIR.'module/Calendar'.DIRECTORY_SEPARATOR);
-
 /**
  * Calendar のページクラス.
  *
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,8 +21,6 @@ @@
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      */
-    defined('CALENDAR_ROOT') || define('CALENDAR_ROOT', DATA_REALDIR.'module/Calendar'.DIRECTORY_SEPARATOR);
     /**
      * Calendar のページクラス.
      *
@@ Expand Down @@