Author: ralfbecker
New Revision: 53578
URL: http://svn.stylite.de/viewvc/egroupware?rev=53578&view=rev
Log:
fix PHP Fatal error in install caused by trying to install no longer used sqlight timezone database
Modified:
branches/14.2/calendar/ (props changed)
branches/14.2/calendar/setup/default_records.inc.php
Propchange: branches/14.2/calendar/
— svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 7 16:53:17 2015
@@ -1,2 +1,2 @@
/branches/Stylite-EPL-11.1/calendar:51445
-/trunk/calendar:51362,51371,51376,51394,51400,51456,51474,51540,51547,51569,51573,51592,51596,51614,51812,51817,51844,51846,51848,51850,51901,51936,51953,52018,52020,52060,52085,52114,52116,52118-52119,52216,52249,52252,52284,52338,52347,52362,52408,52413,52416,52434,52463,52469,52506,52509,52536,52593,52658,52672,52695,52834,52931,52933,52971-52973,52983-52988,53008,53084,53087,53116,53118,53120,53146-53147,53155,53176,53178,53194,53258,53421,53496,53500,53534,53536
+/trunk/calendar:51362,51371,51376,51394,51400,51456,51474,51540,51547,51569,51573,51592,51596,51614,51812,51817,51844,51846,51848,51850,51901,51936,51953,52018,52020,52060,52085,52114,52116,52118-52119,52216,52249,52252,52284,52338,52347,52362,52408,52413,52416,52434,52463,52469,52506,52509,52536,52593,52658,52672,52695,52834,52931,52933,52971-52973,52983-52988,53008,53084,53087,53116,53118,53120,53146-53147,53155,53176,53178,53194,53258,53421,53496,53500,53534,53536,53577
Modified: branches/14.2/calendar/setup/default_records.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/calendar/setup/default_records.inc.php?rev=53578&r1=53577&r2=53578&view=diff
— branches/14.2/calendar/setup/default_records.inc.php (original)
+++ branches/14.2/calendar/setup/default_records.inc.php Mon Sep 7 16:53:17 2015
@@ -23,14 +23,6 @@
),FILE,LINE);
}
-// import timezone data from sqlite database
-try
-{
- calendar_timezones::import_sqlite();
-}
-// catch missing or broken sqlite support and use timezones.db_backup to install timezones
-catch (egw_exception_wrong_userinput $e) // all other exceptions are fatal
-{ - calendar_timezones::import_db_backup();
-}
+// import timezone data
+calendar_timezones::import_zones();
calendar_timezones::import_tz_aliases();
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs