Merge pull request #4696 from colemanw/CRM-15669

[civicrm-core.git] / CRM / Import / DataSource / SQL.php

diff --git a/CRM/Import/DataSource/SQL.php b/CRM/Import/DataSource/SQL.php
index 43d47c138f49083257e24c8e9fc3f36f763166bb..56aa139da2db31036d1c3c1579721cbd83d5b094 100644 (file)
--- a/CRM/Import/DataSource/SQL.php
+++ b/CRM/Import/DataSource/SQL.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -39,7 +39,6 @@ class CRM_Import_DataSource_SQL extends CRM_Import_DataSource {
    *
    * @return array collection of info about this data source
    *
-   * @access public
    *
    */
   public function getInfo() {
@@ -49,7 +48,6 @@ class CRM_Import_DataSource_SQL extends CRM_Import_DataSource {
   /**
    * Set variables up before form is built
    *
-   * @access public
    */
   public function preProcess(&$form) {}
 
@@ -61,7 +59,6 @@ class CRM_Import_DataSource_SQL extends CRM_Import_DataSource {
    * @param CRM_Core_Form $form
    *
    * @return void (operates directly on form argument)
-   * @access public
    */
   public function buildQuickForm(&$form) {
     $form->add('hidden', 'hidden_dataSource', 'CRM_Import_DataSource_SQL');
@@ -76,7 +73,7 @@ class CRM_Import_DataSource_SQL extends CRM_Import_DataSource {
    *
    * @return array|bool
    */
-  static function formRule($fields, $files, $form) {
+  public static function formRule($fields, $files, $form) {
     $errors = array();
 
     // poor man's query validation (case-insensitive regex matching on word boundaries)
@@ -93,7 +90,6 @@ class CRM_Import_DataSource_SQL extends CRM_Import_DataSource {
   /**
    * Process the form submission
    *
-   * @access public
    */
   public function postProcess(&$params, &$db, &$form) {
     $importJob = new CRM_Contact_Import_ImportJob(
@@ -104,4 +100,3 @@ class CRM_Import_DataSource_SQL extends CRM_Import_DataSource {
     $form->set('importTableName', $importJob->getTableName());
   }
 }
-