summaryrefslogtreecommitdiff
path: root/plugins/GeonamesPlugin.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2009-11-17 16:56:43 -0800
committerBrion Vibber <brion@pobox.com>2009-11-17 16:56:43 -0800
commit88ff0eefb411e05e3d622861d90760c12bbba9f0 (patch)
treed1776f2c6b833de68151f1c58d0efbbc90096e81 /plugins/GeonamesPlugin.php
parente3123be350f73e9a9698e864e4e94bb0b4dfe464 (diff)
Renaming GeonamesPlugin::NAMESPACE to GeonamesPlugin::LOCATION_NS to avoid parse errors; 'namespace' is a reserved keyword in PHP 5.3 and later.
Diffstat (limited to 'plugins/GeonamesPlugin.php')
-rw-r--r--plugins/GeonamesPlugin.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/GeonamesPlugin.php b/plugins/GeonamesPlugin.php
index e18957c36..1d7381a80 100644
--- a/plugins/GeonamesPlugin.php
+++ b/plugins/GeonamesPlugin.php
@@ -49,7 +49,7 @@ if (!defined('STATUSNET')) {
class GeonamesPlugin extends Plugin
{
- const NAMESPACE = 1;
+ const LOCATION_NS = 1;
/**
* convert a name into a Location object
@@ -85,7 +85,7 @@ class GeonamesPlugin extends Plugin
$location->lon = $n->lng;
$location->names[$language] = $n->name;
$location->location_id = $n->geonameId;
- $location->location_ns = self::NAMESPACE;
+ $location->location_ns = self::LOCATION_NS;
// handled, don't continue processing!
return false;
@@ -109,7 +109,7 @@ class GeonamesPlugin extends Plugin
function onLocationFromId($id, $ns, $language, &$location)
{
- if ($ns != self::NAMESPACE) {
+ if ($ns != self::LOCATION_NS) {
// It's not one of our IDs... keep processing
return true;
}
@@ -144,7 +144,7 @@ class GeonamesPlugin extends Plugin
$location = new Location();
$location->location_id = $last->geonameId;
- $location->location_ns = self::NAMESPACE;
+ $location->location_ns = self::LOCATION_NS;
$location->lat = $last->lat;
$location->lon = $last->lng;
$location->names[$language] = implode(', ', array_reverse($parts));
@@ -205,7 +205,7 @@ class GeonamesPlugin extends Plugin
}
$location->location_id = $n->geonameId;
- $location->location_ns = self::NAMESPACE;
+ $location->location_ns = self::LOCATION_NS;
$location->lat = $lat;
$location->lon = $lon;
@@ -237,7 +237,7 @@ class GeonamesPlugin extends Plugin
function onLocationNameLanguage($location, $language, &$name)
{
- if ($location->location_ns != self::NAMESPACE) {
+ if ($location->location_ns != self::LOCATION_NS) {
// It's not one of our IDs... keep processing
return true;
}
@@ -292,7 +292,7 @@ class GeonamesPlugin extends Plugin
function onLocationUrl($location, &$url)
{
- if ($location->location_ns != self::NAMESPACE) {
+ if ($location->location_ns != self::LOCATION_NS) {
// It's not one of our IDs... keep processing
return true;
}