Merge branch '2828' into 0.9.x

[quix0rs-gnu-social.git] / plugins / Sitemap / Sitemap_user_count.php

diff --git a/plugins/Sitemap/Sitemap_user_count.php b/plugins/Sitemap/Sitemap_user_count.php
index 7743b05326220648511be86487232c0e2cb4e0ba..0b45021bf53694c8fd206cc8836b1ba6dda5185d 100644 (file)
--- a/plugins/Sitemap/Sitemap_user_count.php
+++ b/plugins/Sitemap/Sitemap_user_count.php
@@ -47,7 +47,6 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
  *
  * @see      DB_DataObject
  */
-
 class Sitemap_user_count extends Memcached_DataObject
 {
     public $__table = 'sitemap_user_count'; // table name
@@ -68,7 +67,6 @@ class Sitemap_user_count extends Memcached_DataObject
      * @return Sitemap_user_count object found, or null for no hits
      *
      */
-
     function staticGet($k, $v=null)
     {
         return Memcached_DataObject::staticGet('Sitemap_user_count', $k, $v);
@@ -82,7 +80,6 @@ class Sitemap_user_count extends Memcached_DataObject
      *
      * @return array array of column definitions
      */
-
     function table()
     {
         return array('registration_date' => DB_DATAOBJECT_DATE + DB_DATAOBJECT_NOTNULL,
@@ -118,7 +115,6 @@ class Sitemap_user_count extends Memcached_DataObject
      *
      * @return array key definitions
      */
-
     function keyTypes()
     {
         return $this->keys();
@@ -154,7 +150,9 @@ class Sitemap_user_count extends Memcached_DataObject
                 $userCounts[$suc->registration_date] = $suc->user_count;
             }
 
-            self::cacheSet('sitemap:user:counts', $userCounts);
+            // Cache user counts for 4 hours.
+
+            self::cacheSet('sitemap:user:counts', $userCounts, null, time() + 4 * 60 * 60);
         }
 
         return $userCounts;
@@ -168,7 +166,6 @@ class Sitemap_user_count extends Memcached_DataObject
         $counts = array();
 
         for ($d = $firstDate; $d <= $today; $d = self::incrementDay($d)) {
-            common_debug("Date = '$d'");
             $n = self::getCount($d);
             self::insertCount($d, $n);
             $counts[$d] = $n;
@@ -217,8 +214,6 @@ class Sitemap_user_count extends Memcached_DataObject
 
     static function insertCount($d, $n)
     {
-        common_debug("Inserting count '$n' for '$d'");
-
         $suc = new Sitemap_user_count();
 
         $suc->registration_date = DB_DataObject_Cast::date($d);
@@ -236,7 +231,8 @@ class Sitemap_user_count extends Memcached_DataObject
         $suc = Sitemap_user_count::staticGet('registration_date', DB_DataObject_Cast::date($d));
 
         if (empty($suc)) {
-            throw new Exception("No such registration date: $d");
+            // TRANS: Exception thrown when a registration date cannot be found.
+            throw new Exception(_m("No such registration date: $d."));
         }
 
         $orig = clone($suc);