Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2010-04-09 17:41:27 +0400
committermatt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2010-04-09 17:41:27 +0400
commite458510d780bf151fcd27ec5c0b423771d2da0af (patch)
treec8363cd6453296a391934428af96832ae25fb97e /plugins/Installation
parent5e35740971a9e2e08769a6fd56ddf96dc26e2560 (diff)
Fixing error message displayed when loading form
Diffstat (limited to 'plugins/Installation')
-rw-r--r--plugins/Installation/FormFirstWebsiteSetup.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/Installation/FormFirstWebsiteSetup.php b/plugins/Installation/FormFirstWebsiteSetup.php
index 9dfcb1b4e0..115b859a95 100644
--- a/plugins/Installation/FormFirstWebsiteSetup.php
+++ b/plugins/Installation/FormFirstWebsiteSetup.php
@@ -20,7 +20,10 @@ class Piwik_Installation_FormFirstWebsiteSetup extends Piwik_Form
{
try {
$timezone = $this->getSubmitValue('timezone');
- Piwik_SitesManager_API::getInstance()->setDefaultTimezone($timezone);
+ if(!empty($timezone))
+ {
+ Piwik_SitesManager_API::getInstance()->setDefaultTimezone($timezone);
+ }
} catch(Exception $e) {
$this->_errors['timezone'] = Piwik_Translate('General_NotValid', Piwik_Translate('Installation_Timezone'));
}
@@ -35,7 +38,7 @@ class Piwik_Installation_FormFirstWebsiteSetup extends Piwik_Form
$javascriptOnClickUrlExample = "\"javascript:if(this.value=='$urlExample'){this.value='http://';} this.style.color='black';\"";
$timezones = Piwik_SitesManager_API::getInstance()->getTimezonesList();
- $timezones = array_merge(array(Piwik_Translate('SitesManager_SelectACity')), $timezones);
+ $timezones = array_merge(array('No timezone' => Piwik_Translate('SitesManager_SelectACity')), $timezones);
$formElements = array(
array('text', 'siteName', Piwik_Translate('Installation_SetupWebSiteName')),