[Fmsystem-commits] [8214]

[Erik Holm-Larsen]

Revision: 8214
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8214
Author:   erikhl
Date:     2011-11-29 12:54:11 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/class.soactivity.inc.php

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2011-11-29 12:49:40 UTC 
(rev 8213)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-11-29 12:54:11 UTC 
(rev 8214)
@@ -695,13 +695,18 @@
                $this->db->query("SELECT * FROM bb_organization WHERE 
show_in_portal=1", __LINE__, __FILE__);
                while($this->db->next_record())
                {
+                       $homepage = $this->db->f('homepage');
+                       if ( trim($homepage) != '' && 
!preg_match("/^http|https:\/\//", trim($homepage)) )
+                       {
+                               $homepage = 'http://'.$homepage;
+                       }
                        $organizations[] = array
                        (
                                'id'                    => (int) 
$this->db->f('id'),
                                'name'                  => 
utf8_decode($this->db->f('name')),
                                'shortname'             => 
utf8_decode($this->db->f('shortname')),
                                'description'   => 
utf8_decode($this->db->f('description')),
-                               'homepage'              => 
$this->db->f('homepage'),
+                               'homepage'              => $homepage,
                                'phone'                 => 
$this->db->f('phone'),
                                'email'                 => $this->db->f('email')
                        );