Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x

[quix0rs-gnu-social.git] / classes / Foreign_service.php

diff --git a/classes/Foreign_service.php b/classes/Foreign_service.php
index 61aa4616eb0b6429223cf5fd4914748d18742197..ef614dbd6e08a28fc20b2f8221a0ab2341bd1249 100644 (file)
--- a/classes/Foreign_service.php
+++ b/classes/Foreign_service.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for foreign_service
  */
-require_once 'classes/Memcached_DataObject.php';
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
 class Foreign_service extends Memcached_DataObject 
 {
@@ -17,7 +17,8 @@ class Foreign_service extends Memcached_DataObject
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Foreign_service',$k,$v); }
+    function staticGet($k,$v=null)
+    { return Memcached_DataObject::staticGet('Foreign_service',$k,$v); }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE