diff options
author | Brion Vibber <brion@pobox.com> | 2010-10-04 12:54:36 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-10-04 12:54:36 -0700 |
commit | 59119482ca34540bd7f0a2a1aa994de1d5328ea2 (patch) | |
tree | 864fdc9dda3da54a78d868339c32479b5296b6d0 /plugins/Sitemap/Sitemap_notice_count.php | |
parent | 2db8aa3ec3f6804f8f16efe754aafb149f4035c9 (diff) | |
parent | 1652ded48c9c62c40157a5142e5231adbc574ddb (diff) |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
actions/hostmeta.php
actions/imsettings.php
classes/User.php
lib/adminpanelaction.php
lib/channel.php
lib/default.php
lib/router.php
lib/util.php
Diffstat (limited to 'plugins/Sitemap/Sitemap_notice_count.php')
-rw-r--r-- | plugins/Sitemap/Sitemap_notice_count.php | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/plugins/Sitemap/Sitemap_notice_count.php b/plugins/Sitemap/Sitemap_notice_count.php index 6e0061e97..2238ff521 100644 --- a/plugins/Sitemap/Sitemap_notice_count.php +++ b/plugins/Sitemap/Sitemap_notice_count.php @@ -51,7 +51,6 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php'; * * @see DB_DataObject */ - class Sitemap_notice_count extends Memcached_DataObject { public $__table = 'sitemap_notice_count'; // table name @@ -72,7 +71,6 @@ class Sitemap_notice_count extends Memcached_DataObject * @return Sitemap_notice_count object found, or null for no hits * */ - function staticGet($k, $v=null) { return Memcached_DataObject::staticGet('Sitemap_notice_count', $k, $v); @@ -86,7 +84,6 @@ class Sitemap_notice_count extends Memcached_DataObject * * @return array array of column definitions */ - function table() { return array('notice_date' => DB_DATAOBJECT_DATE + DB_DATAOBJECT_NOTNULL, @@ -103,7 +100,6 @@ class Sitemap_notice_count extends Memcached_DataObject * * @return array key definitions */ - function keys() { return array('notice_date' => 'K'); @@ -117,7 +113,6 @@ class Sitemap_notice_count extends Memcached_DataObject * * @return array key definitions */ - function keyTypes() { return $this->keys(); @@ -128,7 +123,6 @@ class Sitemap_notice_count extends Memcached_DataObject $noticeCounts = self::cacheGet('sitemap:notice:counts'); if ($noticeCounts === false) { - $snc = new Sitemap_notice_count(); $snc->orderBy('notice_date DESC'); @@ -236,7 +230,8 @@ class Sitemap_notice_count extends Memcached_DataObject $snc = Sitemap_notice_count::staticGet('notice_date', DB_DataObject_Cast::date($d)); if (empty($snc)) { - throw new Exception("No such registration date: $d"); + // TRANS: Exception + throw new Exception(_m("No such registration date: $d.")); } $orig = clone($snc); |