minor code tidyups

diff --git a/CRM/Core/SelectValues.php b/CRM/Core/SelectValues.php
index d0701ebeafcf2c2e3b4ec85c011e7f9bb262db66..1a21060f58192752ffc3eec96b23e9b8fdeda056 100644 (file)
--- a/CRM/Core/SelectValues.php
+++ b/CRM/Core/SelectValues.php
@@ -41,7 +41,7 @@ class CRM_Core_SelectValues {
    * different types of phones
    * @static
    */
-  static function &phoneType() {
+  static function phoneType() {
     static $phoneType = NULL;
     if (!$phoneType) {
       $phoneType = array(
@@ -688,7 +688,7 @@ class CRM_Core_SelectValues {
       // might as well get all the hook tokens to
       $hookTokens = array();
       CRM_Utils_Hook::tokens($hookTokens);
-      foreach ($hookTokens as $category => $tokenValues) {
+      foreach ($hookTokens as $tokenValues) {
         foreach ($tokenValues as $key => $value) {
           if (is_numeric($key)) {
             $key = $value;