From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Wed, 14 Jan 2015 21:09:03 +0000 (+1300)
Subject: a few more minor tidy ups
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5f1ebaec9d23a3c18b629e8b97cd5328b5c0dacf;p=civicrm-core.git

a few more minor tidy ups
---

diff --git a/CRM/Core/BAO/File.php b/CRM/Core/BAO/File.php
index f78231f258..591be45904 100644
--- a/CRM/Core/BAO/File.php
+++ b/CRM/Core/BAO/File.php
@@ -669,7 +669,6 @@ AND       CEF.entity_id    = %2";
     foreach ($currentAttachmentInfo as $fileKey => $fileValue) {
       $fileID = $fileValue['fileID'];
       $fileType = $fileValue['mime_type'];
-      $eid = $entityID;
       if ($fileID) {
         if ($fileType == 'image/jpeg' ||
           $fileType == 'image/pjpeg' ||
diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
index 24643ee900..6edc424c07 100644
--- a/CRM/Core/DAO.php
+++ b/CRM/Core/DAO.php
@@ -1124,8 +1124,10 @@ FROM   civicrm_domain
    * @param bool $i18nRewrite
    * @param bool $trapException
    *
-   * @return CRM_Core_DAO
+   * @return CRM_Core_DAO|object
    *   object that holds the results of the query
+   *   NB - if this is defined as just returning a DAO phpstorm keeps pointing
+   *   out all the properties that are not part of the DAO
    */
   public static function &executeQuery(
     $query,
diff --git a/CRM/SMS/Controller/Send.php b/CRM/SMS/Controller/Send.php
index 2febbdfc99..48037399b7 100644
--- a/CRM/SMS/Controller/Send.php
+++ b/CRM/SMS/Controller/Send.php
@@ -1,5 +1,5 @@
 <?php
-/**
+/*
  +--------------------------------------------------------------------+
  | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
@@ -37,7 +37,7 @@ class CRM_SMS_Controller_Send extends CRM_Core_Controller {
   /**
    * Class constructor
    *
-   * @param null $title
+   * @param string $title
    * @param bool|int $action
    * @param bool $modal
    */
@@ -68,8 +68,7 @@ class CRM_SMS_Controller_Send extends CRM_Core_Controller {
       CRM_Core_BAO_File::uploadNames()
     );
 
-    $config = CRM_Core_Config::singleton();
-    $this->addActions($config->uploadDir,
+    $this->addActions(CRM_Core_Config::singleton()->uploadDir,
       $uploadNames
     );
   }