CRM-15524 - Support addSetting in snippet mode

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

diff --git a/install/civicrm.php b/install/civicrm.php
index b91f8049067e42c720a33edbd7e9cd4a65b3a4ff..debefb2925b073d0778f5299f764d52e7019738e 100644 (file)
--- a/install/civicrm.php
+++ b/install/civicrm.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -62,6 +62,10 @@ function civicrm_setup($filesDirectory) {
   $compileDir = addslashes($compileDir);
 }
 
+/**
+ * @param $name
+ * @param $buffer
+ */
 function civicrm_write_file($name, &$buffer) {
   $fd = fopen($name, "w");
   if (!$fd) {
@@ -71,6 +75,9 @@ function civicrm_write_file($name, &$buffer) {
   fclose($fd);
 }
 
+/**
+ * @param $config
+ */
 function civicrm_main(&$config) {
   global $sqlPath, $crmPath, $cmsPath, $installType;
 
@@ -121,6 +128,11 @@ function civicrm_main(&$config) {
 
 }
 
+/**
+ * @param $dsn
+ * @param $fileName
+ * @param bool $lineMode
+ */
 function civicrm_source($dsn, $fileName, $lineMode = FALSE) {
   global $crmPath;
 
@@ -130,6 +142,7 @@ function civicrm_source($dsn, $fileName, $lineMode = FALSE) {
   if (PEAR::isError($db)) {
     die("Cannot open $dsn: " . $db->getMessage());
   }
+  $db->query("SET NAMES utf8");
 
   $db->query("SET NAMES utf8");
 
@@ -173,6 +186,11 @@ function civicrm_source($dsn, $fileName, $lineMode = FALSE) {
   }
 }
 
+/**
+ * @param $config
+ *
+ * @return string
+ */
 function civicrm_config(&$config) {
   global $crmPath, $comPath;
   global $compileDir;
@@ -225,6 +243,9 @@ function civicrm_config(&$config) {
   return trim($str);
 }
 
+/**
+ * @return string
+ */
 function civicrm_cms_base() {
   global $installType;
 
@@ -275,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';