Fix for PHP spewing notices from commit a373d07ae00b878f47970f2e4a7d86c6ec3a65cf

Please test with error_reporting set to E_ALL!

Classnames and function names aren't first-class objects in PHP and need to be referenced as strings here. :(

diff --git a/plugins/Authentication/AuthenticationPlugin.php b/plugins/Authentication/AuthenticationPlugin.php
index a80da901cf4954b4daa4753ae2a5c620255baded..1b9084187b4369d3a16b928c435f299f7912fc57 100644 (file)
--- a/plugins/Authentication/AuthenticationPlugin.php
+++ b/plugins/Authentication/AuthenticationPlugin.php
@@ -204,7 +204,7 @@ abstract class AuthenticationPlugin extends Plugin
 
     function onCheckSchema() {
         $schema = Schema::get();
-        $schema->ensureDataObject(User_username);
+        $schema->ensureDataObject('User_username');
         return true;
     }
 

diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index 88e23ea3e5611308972fb8a1864633785499b9fd..6dd8a3f5a3bbc174ba4f8d5bbc1db3457831ac65 100644 (file)
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -281,8 +281,8 @@ class OpenIDPlugin extends Plugin
 
     function onCheckSchema() {
         $schema = Schema::get();
-        $schema->ensureDataObject(User_openid);
-        $schema->ensureDataObject(User_openid_trustroot);
+        $schema->ensureDataObject('User_openid');
+        $schema->ensureDataObject('User_openid_trustroot');
         return true;
     }
 

diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php
index df7eac7a2b521c3b51e4a533c0614c702fdec03b..b4d48c74bcf49a471344dd9b23d2cbc8f2a2551f 100644 (file)
--- a/plugins/UserFlag/UserFlagPlugin.php
+++ b/plugins/UserFlag/UserFlagPlugin.php
@@ -48,7 +48,7 @@ class UserFlagPlugin extends Plugin
         $schema = Schema::get();
 
         // For storing user-submitted flags on profiles
-        $schema->ensureDataObject(User_flag_profile);
+        $schema->ensureDataObject('User_flag_profile');
 
         return true;
     }