Commit 5b0809f4 authored by Evan Prodromou's avatar Evan Prodromou

fix caching in location.php

parent 62ba14f5
......@@ -91,6 +91,10 @@ class Location
static function fromId($id, $ns, $language=null)
{
if (is_null($language)) {
$language = common_language();
}
$location = null;
// Let a third-party handle it
......@@ -167,9 +171,9 @@ class Location
function getURL()
{
if ($this->_url == false) { // cached failure
return null;
} else if (is_string($this->_url)) { // cached value
// Keep one cached
if (is_string($this->_url)) {
return $this->_url;
}
......@@ -177,14 +181,8 @@ class Location
Event::handle('LocationUrl', array($this, &$url));
// Save it for later
if (is_null($url)) {
$this->_url = false;
} else {
$this->_url = $url;
}
$this->_url = $url;
return $this->_url;
return $url;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment