Merge branch 'pull'

diff --git a/INSTALL.txt b/INSTALL.txt
index fdd54b765fa4b4e2792dc1a52a530fff3a638b11..574e90975b1e2ed1d6fc904502f150e545227248 100755 (executable)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,14 +1,14 @@
 
-Friendika Installation
+Friendica Installation
 
-We've tried very hard to ensure that Friendika will run on commodity hosting 
+We've tried very hard to ensure that Friendica will run on commodity hosting 
 platforms - such as those used to host Wordpress blogs and Drupal websites. 
-But be aware that Friendika is more than a simple web application. It is a 
+But be aware that Friendica is more than a simple web application. It is a 
 complex communications system which more closely resembles an email server 
 than a web server. For reliability and performance, messages are delivered in
 the background and are queued for later delivery when sites are down. This
 kind of functionality requires a bit more of the host system than the typical
-blog. Not every PHP/MySQL hosting provider will be able to support Friendika. 
+blog. Not every PHP/MySQL hosting provider will be able to support Friendica. 
 Many will. But please review the requirements and confirm these with your 
 hosting provider prior to installation.
 
@@ -21,9 +21,9 @@ impact the installation requirements.
 
 Decide if you will use SSL and obtain an SSL cert. Communications with the
 Diaspora network MAY require both SSL AND an SSL cert signed by a CA which is 
-recognised by the major browsers. Friendika will work with self-signed certs
+recognised by the major browsers. Friendica will work with self-signed certs
 but Diaspora communication may not. For best results, install your cert PRIOR
-to installing Friendika and when visiting your site for the initial 
+to installing Friendica and when visiting your site for the initial 
 installation in step 5, please use the https: link. (Use the http: or non-SSL 
 link if your cert is self-signed). 
  
@@ -51,7 +51,7 @@ php.ini file [or see 'poormancron' in section 8]
 directory/path component in the URL) is preferred. This is REQUIRED if
 you wish to communicate with the Diaspora network.
 
-2. Unpack the Friendika files into the root of your web server document area.
+2. Unpack the Friendica files into the root of your web server document area.
 
        - If you copy the directory tree to your webserver, make sure
        that you also copy .htaccess - as "dot" files are often hidden 
@@ -106,7 +106,7 @@ one shown, substituting for your unique paths and settings:
 
 You can generally find the location of PHP by executing "which php". If you 
 have troubles with this section please contact your hosting provider for 
-assistance. Friendika will not work correctly if you cannot perform this step.
+assistance. Friendica will not work correctly if you cannot perform this step.
 
 You should also be sure that $a->config['php_path'] is set correctly, it should
 look like (changing it to the correct PHP location)
@@ -114,7 +114,7 @@ look like (changing it to the correct PHP location)
 $a->config['php_path'] = '/usr/local/php53/bin/php'
   
 Alternative: You may be able to use the 'poormancron' plugin to perform this
-step if you are using a recent Friendika release. 'poormancron' may result in
+step if you are using a recent Friendica release. 'poormancron' may result in
 perfomance and memory issues and is only suitable for small sites with one or
 two users and a handful of contacts. To do this, edit the file 
 ".htconfig.php" and look for a line describing your plugins. On a fresh 
@@ -173,7 +173,7 @@ generally be world-readable.
 
        Ensure that mod-rewite is installed and working, and that your
 .htaccess file is being used. To verify the latter, create a file test.out
-containing the word "test" in the top directory of Friendika, make it world 
+containing the word "test" in the top directory of Friendica, make it world 
 readable and point your web browser to
 
 http://yoursitenamehere.com/test.out

diff --git a/htconfig.php b/htconfig.php
index 4698e9a94bfe19e10ebffd3b965b7bf41b7388f9..cb6e7b7840d323f5cfd88716ae396513b53d50bb 100755 (executable)
--- a/htconfig.php
+++ b/htconfig.php
@@ -23,7 +23,7 @@ $default_timezone = 'America/Los_Angeles';
 
 // What is your site name?
 
-$a->config['sitename'] = "Friendika Social Network";
+$a->config['sitename'] = "Friendica Social Network";
 
 // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
 // Be certain to create your own personal account before setting 

diff --git a/images/friendica.svg b/images/friendica.svg
index 2155d0b0063501fa9a3eb302aa3e78dc879e4981..2105ef3175372365c99cffeca2be7636249cc019 100755 (executable)
--- a/images/friendica.svg
+++ b/images/friendica.svg
@@ -15,8 +15,8 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.48.0 r9654"
-   sodipodi:docname="friendika.svg"
-   inkscape:export-filename="/home/meta/Documents/My random images/friendika.png"
+   sodipodi:docname="friendica.svg"
+   inkscape:export-filename="/home/meta/Documents/My random images/friendica.png"
    inkscape:export-xdpi="80.552788"
    inkscape:export-ydpi="80.552788">
   <defs

diff --git a/include/Scrape.php b/include/Scrape.php
index e42d22afc64c9e0a792a90bc8abcd0a6c7a8930d..52405ae2dd556e5ee1ce434acfbca1b75f15500a 100755 (executable)
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -314,7 +314,7 @@ function scrape_feed($url) {
  *
  * PROBE_DIASPORA has a bias towards returning Diaspora information
  * while PROBE_NORMAL has a bias towards dfrn/zot - in the case where
- * an address (such as a Friendika address) supports more than one type
+ * an address (such as a Friendica address) supports more than one type
  * of network. 
  *
  */

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index d8f530daf61366f9bf59fd64fe3fff0d6e56dee2..6070b7db21124d046d2a197d7532fd6ea55a08f5 100755 (executable)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -157,7 +157,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 
        $o = '';
 
-       // When used for private messages, we limit correspondence to mutual DFRN/Friendika friends and the selector
+       // When used for private messages, we limit correspondence to mutual DFRN/Friendica friends and the selector
        // to one recipient. By default our selector allows multiple selects amongst all contacts.
 
        $sql_extra = '';

diff --git a/include/api.php b/include/api.php
index 7b8709659e810384a1f1136970b6358aec2ff116..04f95ebd914bcc0aa3cc391d4234e0b04330b52f 100755 (executable)
--- a/include/api.php
+++ b/include/api.php
@@ -179,7 +179,7 @@
                        'updated' => api_date(null),
                        'atom_updated' => datetime_convert('UTC','UTC','now',ATOM_TIME),
                        'language' => $user_info['language'],
-                       'logo'  => $a->get_baseurl()."/images/friendika-32.png",
+                       'logo'  => $a->get_baseurl()."/images/friendica-32.png",
                );
                
                return $arr;
@@ -739,7 +739,7 @@
                if (local_user()===false) return false;
                
                $user_info = api_get_user($a);
-               // in friendika starred item are private
+               // in friendica starred item are private
                // return favorites only for self
                logger('api_favorites: self:' . $user_info['self']);
                
@@ -912,7 +912,7 @@
        function api_statusnet_config(&$a,$type) {
                $name = $a->config['sitename'];
                $server = $a->get_hostname();
-               $logo = $a->get_baseurl() . '/images/friendika-64.png';
+               $logo = $a->get_baseurl() . '/images/friendica-64.png';
                $email = $a->config['admin_email'];
                $closed = (($a->config['register_policy'] == REGISTER_CLOSED) ? 'true' : 'false');
                $private = (($a->config['system']['block_public']) ? 'true' : 'false');

diff --git a/include/nav.php b/include/nav.php
index 95dd37ba6c3aa5f238ee8ff88086aa3e304b535a..c8a44af80b0c9085efa7d939b3cce14d769b0752 100755 (executable)
--- a/include/nav.php
+++ b/include/nav.php
@@ -148,7 +148,7 @@ function nav(&$a) {
        $banner = get_config('system','banner');
 
        if($banner === false) 
-               $banner .= '<a href="http://friendica.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendica.com">Friendica</a></span>';
+               $banner .= '<a href="http://friendica.com"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendica.com">Friendica</a></span>';
 
 
        $tpl = get_markup_template('nav.tpl');

diff --git a/include/poller.php b/include/poller.php
index 7d42c63b5f8d1731ce57e6c280d9ab67cbd58376..3e10533b338e082f6414b0c84da36045bf297ea1 100755 (executable)
--- a/include/poller.php
+++ b/include/poller.php
@@ -349,7 +349,7 @@ function poller_run($argv, $argc){
                                || ($contact['network'] === NETWORK_DIASPORA)
                                || ($contact['network'] === NETWORK_FEED) ) {
 
-                               // Upgrading DB fields from an older Friendika version
+                               // Upgrading DB fields from an older Friendica version
                                // Will only do this once per notify-enabled OStatus contact
                                // or if relationship changes
 

diff --git a/include/text.php b/include/text.php
index b2c7862ce1dd2adbaf9a0923231c935ff9adc955..5ef870fd75225d65da744628f00d84ae97fd5893 100755 (executable)
--- a/include/text.php
+++ b/include/text.php
@@ -759,7 +759,7 @@ function smilies($s, $sample = false) {
                '<img src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
                '<img src="' . $a->get_baseurl() . '/images/smiley-bangheaddesk.gif" alt=":headdesk" />',
                '<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
-               '<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendica" /></a>',
+               '<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
                '<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
 
        );

diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js
index 85b51baeb3078796392eb7d09c08faeca4e18a3d..509466bd9878f3810cadc00259af22db3bdc7198 100755 (executable)
--- a/js/fk.autocomplete.js
+++ b/js/fk.autocomplete.js
@@ -1,5 +1,5 @@
 /**
- * Friendika people autocomplete
+ * Friendica people autocomplete
  *
  * require jQuery, jquery.textareas
  */

diff --git a/library/OAuth1.php b/library/OAuth1.php
index 3b211b146e79ec8f75e27a2f160ada974ef9c1d6..0db6fabcbe8c490f06885e3213d465712ee642e8 100755 (executable)
--- a/library/OAuth1.php
+++ b/library/OAuth1.php
@@ -289,7 +289,7 @@ class OAuthRequest {
       }
 
     }
-    // fix for friendika redirect system
+    // fix for friendica redirect system
     
     $http_url =  substr($http_url, 0, strpos($http_url,$parameters['q'])+strlen($parameters['q']));
     unset( $parameters['q'] );

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
old mode 100755 (executable)
new mode 100644 (file)
index abacd99..5a24f00
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -252,7 +252,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                        $message = unxmlify($xml->message);   // human readable text of what may have gone wrong.
                        switch($status) {
                                case 0:
-                                       notice( t("Confirmation completed successfully.") . EOL);
+                                       info( t("Confirmation completed successfully.") . EOL);
                                        if(strlen($message))
                                                notice( t('Remote site reported: ') . $message . EOL);
                                        break;

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index ceec83e90b25a7202a6955c3bd7736de721f4401..bc159137df697046fa14abb9ee8bc18b59f4a5e0 100755 (executable)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -677,7 +677,7 @@ function dfrn_request_content(&$a) {
                        '$no' => t('No'),
                        '$add_note' => t('Add a personal note:'),
                        '$page_desc' => $page_desc,
-                       '$friendika' => t('Friendica'),
+                       '$friendica' => t('Friendica'),
                        '$statusnet' => t('StatusNet/Federated Social Web'),
                        '$diaspora' => t('Diaspora'),
                        '$diasnote' => t('- please share from your own site as noted above'),

diff --git a/mod/dirfind.php b/mod/dirfind.php
index 801018276644f98adda868676f45fdfdac0e7228..75b1c4976740f1da1e45e426569b4ff48b2516d3 100755 (executable)
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -27,7 +27,7 @@ function dirfind_content(&$a) {
                $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
                        
                if(strlen(get_config('system','directory_submit_url')))
-                       $x = fetch_url('http://dir.friendika.com/lsearch?f=' . $p .  '&search=' . urlencode($search));
+                       $x = fetch_url('http://dir.friendica.com/lsearch?f=' . $p .  '&search=' . urlencode($search));
 
 //TODO fallback local search if global dir not available.
 //             else

diff --git a/mod/match.php b/mod/match.php
index 3645a419da2a6f8a9f48ae9059fdf25dd921b816..1ae7848a63ac19caae3d0d2637f87484269e1d54 100755 (executable)
--- a/mod/match.php
+++ b/mod/match.php
@@ -31,7 +31,7 @@ function match_content(&$a) {
                        $params['p'] = $a->pager['page'];
                        
                if(strlen(get_config('system','directory_submit_url')))
-                       $x = post_url('http://dir.friendika.com/msearch', $params);
+                       $x = post_url('http://dir.friendica.com/msearch', $params);
                else
                        $x = post_url($a->get_baseurl() . '/msearch', $params);
 

diff --git a/mod/ping.php b/mod/ping.php
old mode 100755 (executable)
new mode 100644 (file)
index db68332..9c2e385
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -5,6 +5,7 @@ require_once("include/datetime.php");
 function ping_init(&$a) {
 
        header("Content-type: text/xml");
+       
        echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
                <result>";
 
@@ -90,22 +91,20 @@ function ping_init(&$a) {
                }
 
 
-               $intros1 = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`, 
+               $intros1 = q("SELECT  `intro`.`id`, `intro`.`datetime`, 
                        `fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo` 
                        FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
                        WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid`!=0",
                        intval(local_user())
                );
-               $intros2 = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`, 
+               $intros2 = q("SELECT `intro`.`id`, `intro`.`datetime`, 
                        `contact`.`name`, `contact`.`url`, `contact`.`photo` 
                        FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
                        WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id`!=0",
                        intval(local_user())
                );
                
-               $intro = $intros1[0]['total'] + $intros2[0]['total'];
-               if ($intros1[0]['total']==0) $intros1=Array();
-               if ($intros2[0]['total']==0) $intros2=Array();
+               $intro = count($intros1) + count($intros2);
                $intros = $intros1+$intros2;
 
 

diff --git a/util/README b/util/README
index b8fd7c9ee7bfdeb461f0c13918a9d5ba8549f316..aceade3e235965c670343f83e84e372b5da97f16 100755 (executable)
--- a/util/README
+++ b/util/README
@@ -115,7 +115,7 @@ When strings are added or modified in source, you could run
        to extract strings from source files and join them with the existing .po file:
        new strings are added, the existing are not overwritten.
        
-If you already translated Friendika using strings.php, you could import your old
+If you already translated Friendica using strings.php, you could import your old
 translation to messages.po. Run:
 $ php util/php2po.php view/<language>/strings.php
 

diff --git a/view/admin_remoteupdate.tpl b/view/admin_remoteupdate.tpl
index 41ecfaf85cf89f5f6e0e7cc302ce73a103e80e8f..874c6e6267bddd416fac71d8360d51ba43fe0ce4 100755 (executable)
--- a/view/admin_remoteupdate.tpl
+++ b/view/admin_remoteupdate.tpl
@@ -62,7 +62,7 @@
        <div class="background"></div>
        <div class="panel">
                <div class="panel_in">
-                       <h1>Friendika Update</h1>
+                       <h1>Friendica Update</h1>
                        <div class="panel_text"></div>
                        <div class="panel_actions">
                                <input type="button" value="$close" class="panel_action_close">
@@ -81,7 +81,7 @@
        {{ if $canwrite }}
                <div class="submit"><input type="submit" name="remoteupdate" value="$submit" /></div>
        {{ else }}
-               <h3>Your friendika installation is not writable by web server.</h3>
+               <h3>Your friendica installation is not writable by web server.</h3>
                {{ if $canftp }}
                        <p>You can try to update via FTP</p>
                        {{ inc field_input.tpl with $field=$ftphost }}{{ endinc }}

diff --git a/view/auto_request.tpl b/view/auto_request.tpl
index 377da25c53eacbdea8d741275ffa2134bb6a6b1d..204fcf2475abca9d1172b1217513a8315b9c2710 100755 (executable)
--- a/view/auto_request.tpl
+++ b/view/auto_request.tpl
@@ -4,7 +4,7 @@
 <p id="dfrn-request-intro">
 $page_desc<br />
 <ul id="dfrn-request-networks">
-<li><a href="http://friendika.com" title="$friendika">$friendika</a></li>
+<li><a href="http://friendica.com" title="$friendica">$friendica</a></li>
 <li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li>
 <li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li>
 </ul>

diff --git a/view/cs/htconfig.tpl b/view/cs/htconfig.tpl
index 87ded77fd8dfea458b028f398bee6c15c596eeef..5d116dd995b3039850312e37b76eaecbd2aea77d 100755 (executable)
--- a/view/cs/htconfig.tpl
+++ b/view/cs/htconfig.tpl
@@ -53,8 +53,8 @@ $a->config['php_path'] = '$phpath';
 
 // URL adresy globálního adresáře.
 
-$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
 
 // PuSH - také zvaný jako  pubsubhubbub URL. Tímto zajistíte doručování veřejných přízpěvků stejně rychle jako těch soukromých
 

diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl
index c535cefa68c5ac27d4172b1de158def3d5a3208b..76709ea752df7e37f175a1b6db468db5ee642f44 100755 (executable)
--- a/view/de/htconfig.tpl
+++ b/view/de/htconfig.tpl
@@ -49,8 +49,8 @@ $a->config['php_path'] = '$phpath';
 
 // Location of global directory submission page.
 
-$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
 
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
 

diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl
index 3f4300da6b827b2bed5a106ccabdc5969d812f73..cd98a4daabe9bf5a46f590011f74f34c6a4ec251 100755 (executable)
--- a/view/dfrn_request.tpl
+++ b/view/dfrn_request.tpl
@@ -4,7 +4,7 @@
 <p id="dfrn-request-intro">
 $page_desc<br />
 <ul id="dfrn-request-networks">
-<li><a href="http://friendika.com" title="$friendika">$friendika</a></li>
+<li><a href="http://friendica.com" title="$friendica">$friendica</a></li>
 <li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li>
 <li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li>
 </ul>

diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 3eb2da0704115bbbf36be52bfcd0089f6ce5bfce..9e39eeb59cc88fe0c94e78495ed60dcebc709475 100755 (executable)
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -49,8 +49,8 @@ $a->config['php_path'] = '$phpath';
 
 // Location of global directory submission page.
 
-$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
 
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
 

diff --git a/view/es/htconfig.tpl b/view/es/htconfig.tpl
index 9f6e282aba239b090a78ed38e2123a2b26054db9..6158f6a33d73a6aae29ceed5dd71c01cd147acde 100755 (executable)
--- a/view/es/htconfig.tpl
+++ b/view/es/htconfig.tpl
@@ -49,8 +49,8 @@ $a->config['php_path'] = '$phpath';
 
 // Location of global directory submission page.
 
-$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
 
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
 

diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl
index c535cefa68c5ac27d4172b1de158def3d5a3208b..76709ea752df7e37f175a1b6db468db5ee642f44 100755 (executable)
--- a/view/fr/htconfig.tpl
+++ b/view/fr/htconfig.tpl
@@ -49,8 +49,8 @@ $a->config['php_path'] = '$phpath';
 
 // Location of global directory submission page.
 
-$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
 
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
 

diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl
index 9f6e282aba239b090a78ed38e2123a2b26054db9..6158f6a33d73a6aae29ceed5dd71c01cd147acde 100755 (executable)
--- a/view/it/htconfig.tpl
+++ b/view/it/htconfig.tpl
@@ -49,8 +49,8 @@ $a->config['php_path'] = '$phpath';
 
 // Location of global directory submission page.
 
-$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
 
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
 

diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl
index c535cefa68c5ac27d4172b1de158def3d5a3208b..76709ea752df7e37f175a1b6db468db5ee642f44 100755 (executable)
--- a/view/sv/htconfig.tpl
+++ b/view/sv/htconfig.tpl
@@ -49,8 +49,8 @@ $a->config['php_path'] = '$phpath';
 
 // Location of global directory submission page.
 
-$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
 
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts