Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-10-23-19-26-23

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

diff --git a/install/civicrm.php b/install/civicrm.php
index 21ac16abd1c5fa00004f4e9d3bd2490ccdf979c7..aade7071f8a8f5f10dbdff4b8048f62492f8965e 100644 (file)
--- a/install/civicrm.php
+++ b/install/civicrm.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2013                                |
  +--------------------------------------------------------------------+
@@ -216,7 +216,7 @@ function civicrm_config(&$config) {
 
   $params['siteKey'] = md5(uniqid('', TRUE) . $params['baseURL']);
 
-  $str = file_get_contents($tplPath . 'civicrm.settings.php.tpl');
+  $str = file_get_contents($tplPath . 'civicrm.settings.php.template');
   foreach ($params as $key => $value) {
     $str = str_replace('%%' . $key . '%%', $value, $str);
   }