X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=install%2Fcivicrm.php;h=ca5db0bc3a1002573303cf1a559bc6c3583bd01d;hb=88a6f4b3c5448b5704a1c42bcc838d84c254494f;hp=11b8931934d1c5e1d59c2aa14523cd413f10538a;hpb=7dee6a13d167a1dd2b4bf1075252bcb7e324c7e5;p=civicrm-core.git

diff --git a/install/civicrm.php b/install/civicrm.php
index 11b8931934..ca5db0bc3a 100644
--- 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                                |
  +--------------------------------------------------------------------+
@@ -36,6 +36,12 @@ 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;
 
@@ -56,6 +62,10 @@ function civicrm_setup($filesDirectory) {
   $compileDir = addslashes($compileDir);
 }
 
+/**
+ * @param string $name
+ * @param $buffer
+ */
 function civicrm_write_file($name, &$buffer) {
   $fd = fopen($name, "w");
   if (!$fd) {
@@ -65,6 +75,9 @@ function civicrm_write_file($name, &$buffer) {
   fclose($fd);
 }
 
+/**
+ * @param $config
+ */
 function civicrm_main(&$config) {
   global $sqlPath, $crmPath, $cmsPath, $installType;
 
@@ -115,8 +128,14 @@ function civicrm_main(&$config) {
 
 }
 
+/**
+ * @param $dsn
+ * @param string $fileName
+ * @param bool $lineMode
+ */
 function civicrm_source($dsn, $fileName, $lineMode = FALSE) {
   global $crmPath;
+
   require_once "$crmPath/packages/DB.php";
 
   $db = DB::connect($dsn);
@@ -167,6 +186,11 @@ function civicrm_source($dsn, $fileName, $lineMode = FALSE) {
   }
 }
 
+/**
+ * @param $config
+ *
+ * @return string
+ */
 function civicrm_config(&$config) {
   global $crmPath, $comPath;
   global $compileDir;
@@ -219,6 +243,9 @@ function civicrm_config(&$config) {
   return trim($str);
 }
 
+/**
+ * @return string
+ */
 function civicrm_cms_base() {
   global $installType;
 
@@ -269,6 +296,9 @@ function civicrm_cms_base() {
   return $url . $baseURL;
 }
 
+/**
+ * @return string
+ */
 function civicrm_home_url() {
   $drupalURL = civicrm_cms_base();
   return $drupalURL . 'index.php?q=civicrm';