Attempt to remove dependency on Tz\import. refs #1604

@@ -9,9 +9,13 @@
 
 
 namespace Tz\WordPress\Tools\Auth;
 namespace Tz\WordPress\Tools\Auth;
 
 
+use BadMethodCallException;
+use Exception;
+use InvalidArgumentException;
+use LogicException;
+use Tz\Common;
 use Tz\WordPress\Tools;
 use Tz\WordPress\Tools;
-use Tz, Tz\Common;
-use Exception, LogicException, InvalidArgumentException, BadMethodCallException;
+use Tz;
 use WP_User;
 use WP_User;
 
 
 // These are all WordPress hooks, I put them here for easy reference
 // These are all WordPress hooks, I put them here for easy reference
@@ -43,8 +47,6 @@ const PASS_MAX_LEN = 15; // Maximum length of password
                 }
                 }
             }
             }
         }
         }
-
-        Tz\import('Tz', 'trunk');
     });
     });
 
 
 /**
 /**

@@ -8,8 +8,6 @@ const CAPABILITY = 'edit_user_details';
 const HTML_NS    = 'tzud-';
 const HTML_NS    = 'tzud-';
 
 
     call_user_func(function() {
     call_user_func(function() {
-        Tz\import('Tz', 'trunk');
-
         $role = get_role('administrator');
         $role = get_role('administrator');
         $role->add_cap(CAPABILITY);
         $role->add_cap(CAPABILITY);
 
 
@@ -25,8 +23,8 @@ function register_field($id, $display = null) { //, Common\Callback $fn = null)
     }
     }
 
 
     Vars::$fields[$id] = Array(
     Vars::$fields[$id] = Array(
-        'id'       => $id
-      , 'label'    => $display
+        'id'       => $id,
+        'label'    => $display
     );
     );
 }
 }
 
 
@@ -73,4 +71,3 @@ class Vars {
 
 
     public static $fields = Array();
     public static $fields = Array();
 }
 }
-?>
\ No newline at end of file