From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 24 Jan 2013 15:17:37 +0000 (+0000)
Subject: Merge "Fix cache key used by SiteSQLStore."
X-Git-Tag: 1.31.0-rc.0~20934
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=5f9437659fac5521f0a8e00cdb8dec17232c159f;p=lhc%2Fweb%2Fwiklou.git

Merge "Fix cache key used by SiteSQLStore."
---

5f9437659fac5521f0a8e00cdb8dec17232c159f
diff --cc includes/site/Site.php
index d09c64d67f,078bd26c76..5394860e02
--- a/includes/site/Site.php
+++ b/includes/site/Site.php
@@@ -690,4 -654,4 +700,4 @@@ class Site implements Serializable 
  /**
   * @deprecated
   */
--class SiteObject extends Site {}
++class SiteObject extends Site {}