Merge branch 'mlutfy-CRM-13584'

[civicrm-core.git] / install / civicrm.php

diff --git a/install/civicrm.php b/install/civicrm.php
index debefb2925b073d0778f5299f764d52e7019738e..c66cdb94e561c92a053ce54a7ab32b3d9fb0150a 100644 (file)
--- a/install/civicrm.php
+++ b/install/civicrm.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -23,25 +23,19 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
  * @package CRM
  * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
- *
+ * @param $filesDirectory
  */
 function civicrm_setup($filesDirectory) {
   global $crmPath, $sqlPath, $pkgPath, $tplPath;
   global $compileDir;
 
-  $pkgPath = $crmPath . DIRECTORY_SEPARATOR . 'packages';
-  set_include_path($crmPath . PATH_SEPARATOR .
-    $pkgPath . PATH_SEPARATOR .
-    get_include_path()
-  );
-
   $sqlPath = $crmPath . DIRECTORY_SEPARATOR . 'sql';
   $tplPath = $crmPath . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . 'CRM' . DIRECTORY_SEPARATOR . 'common' . DIRECTORY_SEPARATOR;
 
@@ -63,7 +57,7 @@ function civicrm_setup($filesDirectory) {
 }
 
 /**
- * @param $name
+ * @param string $name
  * @param $buffer
  */
 function civicrm_write_file($name, &$buffer) {
@@ -71,7 +65,7 @@ function civicrm_write_file($name, &$buffer) {
   if (!$fd) {
     die("Cannot open $name");
   }
-  fputs($fd, $buffer);
+  fwrite($fd, $buffer);
   fclose($fd);
 }
 
@@ -130,7 +124,7 @@ function civicrm_main(&$config) {
 
 /**
  * @param $dsn
- * @param $fileName
+ * @param string $fileName
  * @param bool $lineMode
  */
 function civicrm_source($dsn, $fileName, $lineMode = FALSE) {
@@ -209,14 +203,14 @@ function civicrm_config(&$config) {
   $params['baseURL'] = isset($config['base_url']) ? $config['base_url'] : civicrm_cms_base();
   if ($installType == 'drupal') {
     if (version_compare(VERSION, '7.0-rc1') >= 0) {
-      $params['cms']       = 'Drupal';
+      $params['cms'] = 'Drupal';
       $params['CMSdbUser'] = addslashes($config['drupal']['username']);
       $params['CMSdbPass'] = addslashes($config['drupal']['password']);
       $params['CMSdbHost'] = $config['drupal']['server'];
       $params['CMSdbName'] = addslashes($config['drupal']['database']);
     }
     elseif (version_compare(VERSION, '6.0') >= 0) {
-      $params['cms']       = 'Drupal6';
+      $params['cms'] = 'Drupal6';
       $params['CMSdbUser'] = addslashes($config['drupal']['username']);
       $params['CMSdbPass'] = addslashes($config['drupal']['password']);
       $params['CMSdbHost'] = $config['drupal']['server'];
@@ -224,7 +218,7 @@ function civicrm_config(&$config) {
     }
   }
   else {
-    $params['cms']       = 'WordPress';
+    $params['cms'] = 'WordPress';
     $params['CMSdbUser'] = addslashes(DB_USER);
     $params['CMSdbPass'] = addslashes(DB_PASSWORD);
     $params['CMSdbHost'] = DB_HOST;
@@ -303,4 +297,3 @@ function civicrm_home_url() {
   $drupalURL = civicrm_cms_base();
   return $drupalURL . 'index.php?q=civicrm';
 }
-