@@ -44,7 +44,7 @@ |
||
44 | 44 | $form_pass2 = Filter::post('form_pass2', WT_REGEX_PASSWORD); |
45 | 45 | $form_email = Filter::postEmail('form_email'); |
46 | 46 | $form_rootid = Filter::post('form_rootid', WT_REGEX_XREF); |
47 | -$form_theme = Filter::post('form_theme', implode('|', array_keys(Theme::themeNames())), '');; |
|
47 | +$form_theme = Filter::post('form_theme', implode('|', array_keys(Theme::themeNames())), ''); ; |
|
48 | 48 | $form_language = Filter::post('form_language'); |
49 | 49 | $form_timezone = Filter::post('form_timezone'); |
50 | 50 | $form_contact_method = Filter::post('form_contact_method'); |
@@ -60,14 +60,14 @@ |
||
60 | 60 | 'MADRI', 'MANAU', 'MANHA', 'MANIL', 'MANTI', 'MEDFO', 'MELBO', 'MEMPH', |
61 | 61 | 'MERID', 'MEXIC', 'MNTVD', 'MONTE', 'MONTI', 'MONTR', 'MTIMP', 'NASHV', |
62 | 62 | 'NAUV2', 'NAUVO', 'NBEAC', 'NUKUA', 'NYORK', 'NZEAL', 'OAKLA', 'OAXAC', |
63 | - 'OGDEN', 'OKLAH', 'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE', |
|
64 | - 'PAYSO', 'PERTH', 'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO', |
|
63 | + 'OGDEN', 'OKLAH', 'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE', |
|
64 | + 'PAYSO', 'PERTH', 'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO', |
|
65 | 65 | 'QUETZ', 'RALEI', 'RECIF', 'REDLA', 'REGIN', 'RENO', 'REXBU', 'SACRA', |
66 | - 'SAMOA', 'SANTI', 'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL', |
|
67 | - 'SGEOR', 'SJOSE', 'SLAKE', 'SLOUI', 'SNOWF','SPAUL', 'SPMIN', 'SPOKA', |
|
66 | + 'SAMOA', 'SANTI', 'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL', |
|
67 | + 'SGEOR', 'SJOSE', 'SLAKE', 'SLOUI', 'SNOWF', 'SPAUL', 'SPMIN', 'SPOKA', |
|
68 | 68 | 'STOCK', 'SUVA', 'SWISS', 'SYDNE', 'TAIPE', 'TAMPI', 'TEGUC', 'TGUTI', |
69 | - 'TIHUA', 'TOKYO', 'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA', |
|
70 | - 'VILLA', 'WASHI', 'WINTE', |
|
69 | + 'TIHUA', 'TOKYO', 'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA', |
|
70 | + 'VILLA', 'WASHI', 'WINTE', |
|
71 | 71 | ); |
72 | 72 | } |
73 | 73 |
@@ -91,8 +91,7 @@ |
||
91 | 91 | // Create the underlying PDO object |
92 | 92 | self::$pdo = new PDO( |
93 | 93 | (substr($DBHOST, 0, 1) === '/' ? |
94 | - "mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : |
|
95 | - "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}" |
|
94 | + "mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}" |
|
96 | 95 | ), |
97 | 96 | $DBUSER, $DBPASS, |
98 | 97 | array( |
@@ -1714,24 +1714,24 @@ |
||
1714 | 1714 | if ($endjd === WT_CLIENT_JD) { |
1715 | 1715 | // We're dealing with the Today’s Events block |
1716 | 1716 | if ($filter === 0) { |
1717 | - $html .= I18N::translate('No events exist for today.'); |
|
1717 | + $html .= I18N::translate('No events exist for today.'); |
|
1718 | 1718 | } else { |
1719 | - $html .= I18N::translate('No events for living individuals exist for today.'); |
|
1719 | + $html .= I18N::translate('No events for living individuals exist for today.'); |
|
1720 | 1720 | } |
1721 | 1721 | } else { |
1722 | 1722 | // We're dealing with the Upcoming Events block |
1723 | 1723 | if ($filter === 0) { |
1724 | 1724 | if ($endjd === $startjd) { |
1725 | - $html .= I18N::translate('No events exist for tomorrow.'); |
|
1725 | + $html .= I18N::translate('No events exist for tomorrow.'); |
|
1726 | 1726 | } else { |
1727 | - $html .= /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1)); |
|
1727 | + $html .= /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1)); |
|
1728 | 1728 | } |
1729 | 1729 | } else { |
1730 | 1730 | if ($endjd === $startjd) { |
1731 | - $html .= I18N::translate('No events for living individuals exist for tomorrow.'); |
|
1731 | + $html .= I18N::translate('No events for living individuals exist for tomorrow.'); |
|
1732 | 1732 | } else { |
1733 | 1733 | // I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” |
1734 | - $html .= I18N::plural('No events for living people exist for the next %s day.', 'No events for living people exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1)); |
|
1734 | + $html .= I18N::plural('No events for living people exist for the next %s day.', 'No events for living people exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1)); |
|
1735 | 1735 | } |
1736 | 1736 | } |
1737 | 1737 | } |
@@ -42,7 +42,7 @@ |
||
42 | 42 | { |
43 | 43 | $last_update_timestamp = Site::getPreference('LATEST_WT_VERSION_TIMESTAMP'); |
44 | 44 | if ($last_update_timestamp < WT_TIMESTAMP - 24 * 60 * 60) { |
45 | - $site_uuid = (string) Site::getPreference('SITE_UUID'); |
|
45 | + $site_uuid = (string) Site::getPreference('SITE_UUID'); |
|
46 | 46 | if ($site_uuid === '') { |
47 | 47 | $site_uuid = Uuid::uuid4(); |
48 | 48 | Site::setPreference('SITE_UUID', $site_uuid); |