diff options
| author | Lester Caine ext:(%22) <lester@lsces.co.uk> | 2012-04-15 22:14:06 +0100 |
|---|---|---|
| committer | Lester Caine ext:(%22) <lester@lsces.co.uk> | 2012-04-15 22:14:06 +0100 |
| commit | db5b4ca3b928017e11c7a63d65e1e9b784a587d7 (patch) | |
| tree | 884d2f965b943b6472e5e7555008880ed802eb9a /import | |
| parent | f35583f7c089b9ca39d6a4e3bb05e30cf4b6363e (diff) | |
| download | contact-db5b4ca3b928017e11c7a63d65e1e9b784a587d7.tar.gz contact-db5b4ca3b928017e11c7a63d65e1e9b784a587d7.tar.bz2 contact-db5b4ca3b928017e11c7a63d65e1e9b784a587d7.zip | |
Tidy up to remove 'STRICT' warnings
Split static and dynamic use of getDisplayUrl
Create getContentUrl as the instantiated version
load parameters need to be identical across all classes
Diffstat (limited to 'import')
| -rw-r--r-- | import/ContactOld.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/import/ContactOld.php b/import/ContactOld.php index e22384c..a8fc8eb 100644 --- a/import/ContactOld.php +++ b/import/ContactOld.php @@ -59,7 +59,7 @@ class Contact extends LibertyBase { $this->mContactName = $result->fields['title']; $this->mInfo['creator'] = (isset( $result->fields['creator_real_name'] ) ? $result->fields['creator_real_name'] : $result->fields['creator_user'] ); $this->mInfo['editor'] = (isset( $result->fields['modifier_real_name'] ) ? $result->fields['modifier_real_name'] : $result->fields['modifier_user'] ); - $this->mInfo['display_url'] = $this->getDisplayUrl(); + $this->mInfo['display_url'] = $this->getContactUrl(); $os1 = new OSRef($this->mInfo['x_coordinate'], $this->mInfo['y_coordinate']); $ll1 = $os1->toLatLng(); $this->mInfo['prop_lat'] = $ll1->lat; @@ -211,9 +211,9 @@ class Contact extends LibertyBase { if ( $this->mContactId != $aux['contact_id'] ) $this->load($aux['contact_id']); if (empty($this->mInfo['contact_id']) ) { - $ret = '<a href="'.$this->getDisplayUrl($aux['contact_id']).'">'.$aux['title'].'</a>'; + $ret = '<a href="'.$this->getContactUrl($aux['contact_id']).'">'.$aux['title'].'</a>'; } else { - $ret = '<a href="'.$this->getDisplayUrl($aux['contact_id']).'">'."Contact - ".$this->mInfo['title'].'</a>'; + $ret = '<a href="'.$this->getContactUrl($aux['contact_id']).'">'."Contact - ".$this->mInfo['title'].'</a>'; } return $ret; } @@ -283,7 +283,7 @@ class Contact extends LibertyBase { $this->mDb->CompleteTrans(); while ($res = $result->fetchRow()) { - $res['contact_url'] = $this->getDisplayUrl( $res['contact_id'] ); + $res['contact_url'] = $this->getContactUrl( $res['contact_id'] ); $ret[] = $res; } |