From 3a601ff66fed90a45e1f7d391748504b39d55713 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 13 Aug 2012 16:46:24 -0700 Subject: [PATCH] rev update --- boot.php | 8 ++++++-- util/messages.po | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/boot.php b/boot.php index 8105451c1d..81c8c9f81f 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1433' ); +define ( 'FRIENDICA_VERSION', '3.0.1434' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1154 ); @@ -735,9 +735,13 @@ if(! function_exists('check_config')) { // than the currently visited url, store the current value accordingly. // "Radically different" ignores common variations such as http vs https // and www.example.com vs example.com. + // We will only change the url to an ip address if there is no existing setting - if((! x($url)) || (! link_compare($url,$a->get_baseurl()))) + if(! x($url)) $url = set_config('system','url',$a->get_baseurl()); + if((! link_compare($url,$a->get_baseurl())) && (! preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$a->get_hostname))) + $url = set_config('system','url',$a->get_baseurl()); + if($build != DB_UPDATE_VERSION) { $stored = intval($build); diff --git a/util/messages.po b/util/messages.po index ad53cf51a1..8fc107e831 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1433\n" +"Project-Id-Version: 3.0.1434\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-12 10:00-0700\n" +"POT-Creation-Date: 2012-08-13 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -56,7 +56,7 @@ msgstr "" #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../addon/facebook/facebook.php:516 ../../addon/dav/layout.fnk.php:354 -#: ../../include/items.php:3815 ../../index.php:315 +#: ../../include/items.php:3816 ../../index.php:315 msgid "Permission denied." msgstr "" @@ -859,7 +859,7 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3206 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3207 msgid "[Name Withheld]" msgstr "" @@ -1913,7 +1913,7 @@ msgstr "" #: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:1200 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3215 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3216 #: ../../boot.php:792 msgid "Administrator" msgstr "" @@ -2983,7 +2983,7 @@ msgstr "" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../mod/admin.php:708 ../../mod/admin.php:907 ../../mod/display.php:29 -#: ../../mod/display.php:135 ../../include/items.php:3693 +#: ../../mod/display.php:135 ../../include/items.php:3694 msgid "Item not found." msgstr "" @@ -3811,15 +3811,15 @@ msgstr "" msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:21 ../../boot.php:1056 +#: ../../mod/profile.php:22 ../../boot.php:1056 msgid "Requested profile is not available." msgstr "" -#: ../../mod/profile.php:141 ../../mod/display.php:67 +#: ../../mod/profile.php:142 ../../mod/display.php:67 msgid "Access to this profile has been restricted." msgstr "" -#: ../../mod/profile.php:166 +#: ../../mod/profile.php:167 msgid "Tips for New Members" msgstr "" @@ -8072,15 +8072,15 @@ msgstr "" msgid "following" msgstr "" -#: ../../include/items.php:3213 +#: ../../include/items.php:3214 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:3213 +#: ../../include/items.php:3214 msgid "You have a new follower at " msgstr "" -#: ../../include/items.php:3882 +#: ../../include/items.php:3883 msgid "Archives" msgstr "" -- 2.39.5