+--------------------------------------------------------------------+
| CiviCRM version 4.6 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014 |
+ | Copyright CiviCRM LLC (c) 2004-2015 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
| CiviCRM is free software; you can copy, modify, and distribute it |
| under the terms of the GNU Affero General Public License |
- | Version 3, 19 November 2007. |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
| |
| CiviCRM is distributed in the hope that it will be useful, but |
| WITHOUT ANY WARRANTY; without even the implied warranty of |
| See the GNU Affero General Public License for more details. |
| |
| You should have received a copy of the GNU Affero General Public |
- | License along with this program; if not, contact CiviCRM LLC |
+ | License and the CiviCRM Licensing Exception along |
+ | with this program; if not, contact CiviCRM LLC |
| at info[AT]civicrm[DOT]org. If you have questions about the |
| 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
+ * @copyright CiviCRM LLC (c) 2004-2015
* $Id$
*
*/
}
/**
- * Compute any messages which should be displayed beforeupgrade
+ * Compute any messages which should be displayed beforeupgrade.
*
* Note: This function is called iteratively for each upcoming
* revision to the database.
*
* @param $preUpgradeMessage
- * @param $rev
- * String, a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'.
+ * @param string $rev
+ * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'.
* @param null $currentVer
*
* @return void
}
if ($oversizedEntries > 0) {
$preUpgradeMessage .= '<br/>' . ts("WARNING: There are %1 word-replacement entries which will not be valid in v4.4+ (eg with over 255 characters). They will be dropped during upgrade. For details, consult the CiviCRM log.", array(
- 1 => $oversizedEntries,
- ));
+ 1 => $oversizedEntries,
+ ));
}
}
}
/**
- * Compute any messages which should be displayed after upgrade
+ * Compute any messages which should be displayed after upgrade.
*
- * @param $postUpgradeMessage
- * String, alterable.
- * @param $rev
- * String, an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs.
+ * @param string $postUpgradeMessage
+ * alterable.
+ * @param string $rev
+ * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs.
* @return void
*/
public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
WHERE ceft.entity_table = 'civicrm_contribution' AND cft.payment_instrument_id IS NULL;";
$dao = CRM_Core_DAO::executeQuery($query);
if ($dao->N) {
- $postUpgradeMessage .= '<br /><br /><strong>' . ts('Your database contains %1 financial transaction records with no payment instrument (Paid By is empty). If you use the Accounting Batches feature this may result in unbalanced transactions. If you do not use this feature, you can ignore the condition (although you will be required to select a Paid By value for new transactions). <a href="%2" target="_blank">You can review steps to correct transactions with missing payment instruments on the wiki.</a>', array(1 => $dao->N, 2 => 'http://wiki.civicrm.org/confluence/display/CRMDOC/Fixing+Transactions+Missing+a+Payment+Instrument+-+4.4.3+Upgrades')) . '</strong>';
+ $postUpgradeMessage .= '<br /><br /><strong>' . ts('Your database contains %1 financial transaction records with no payment instrument (Paid By is empty). If you use the Accounting Batches feature this may result in unbalanced transactions. If you do not use this feature, you can ignore the condition (although you will be required to select a Paid By value for new transactions). <a href="%2" target="_blank">You can review steps to correct transactions with missing payment instruments on the wiki.</a>', array(
+ 1 => $dao->N,
+ 2 => 'http://wiki.civicrm.org/confluence/display/CRMDOC/Fixing+Transactions+Missing+a+Payment+Instrument+-+4.4.3+Upgrades',
+ )) . '</strong>';
}
}
if ($rev == '4.4.6') {
}
/**
- * @param CRM_Queue_TaskContext $ctx
- * @param int $startId
- * @param int $endId
+ * @param $rev
+ * @param $originalVer
+ * @param $latestVer
*
- * @return bool
+ * @return void
*/
public function upgrade_4_4_7($rev, $originalVer, $latestVer) {
// For WordPress/Joomla(?), cleanup broken image_URL from 4.4.6 upgrades - https://issues.civicrm.org/jira/browse/CRM-14971
$this->addTask(ts('Update saved search information'), 'changeSavedSearch');
}
+ /**
+ * Upgrade image URLs.
+ *
+ * @param \CRM_Queue_TaskContext $ctx
+ * @param $startId
+ * @param $endId
+ *
+ * @return bool
+ */
public static function upgradeImageUrls(CRM_Queue_TaskContext $ctx, $startId, $endId) {
$dao = self::findContactImageUrls($startId, $endId);
$failures = array();
+ $config = CRM_Core_Config::singleton();
while ($dao->fetch()) {
$imageURL = $dao->image_url;
$baseurl = CIVICRM_UF_BASEURL;
+ //CRM-15897 - gross hack for joomla to remove the administrator/
+ if ($config->userFramework == 'Joomla') {
+ $baseurl = str_replace("/administrator/", "/", $baseurl);
+ }
$baselen = strlen($baseurl);
if (substr($imageURL, 0, $baselen) == $baseurl) {
$photo = basename($dao->image_url);
- $config = CRM_Core_Config::singleton();
$fullpath = $config->customFileUploadDir . $photo;
if (file_exists($fullpath)) {
// For anyone who upgraded 4.4.6 release (eg 4.4.0=>4.4.6), the $newImageUrl incorrectly used backend URLs.
// For anyone who skipped 4.4.6 (eg 4.4.0=>4.4.7), the $newImageUrl correctly uses frontend URLs
self::setContactImageUrl($dao->id,
- CRM_Utils_System::url('civicrm/contact/imagefile', 'photo=' . $photo, TRUE, NULL, TRUE, TRUE));
+ CRM_Utils_System::url('civicrm/contact/imagefile', 'photo=' . $photo, TRUE, NULL, TRUE, TRUE));
}
else {
$failures[$dao->id] = $dao->image_url;
return TRUE;
}
+ /**
+ * Change saved search.
+ *
+ * @param \CRM_Queue_TaskContext $ctx
+ *
+ * @return bool
+ */
public static function changeSavedSearch(CRM_Queue_TaskContext $ctx) {
$membershipStatuses = array_flip(CRM_Member_PseudoConstant::membershipStatus());
/**
* @param int $startId
* @param int $endId
- * @return CRM_Core_DAO columns include "id" and "image_URL"
+ * @return CRM_Core_DAO
+ * columns include "id" and "image_URL"
*/
public static function findContactImageUrls($startId, $endId) {
$sql = "
*
* @param CRM_Queue_TaskContext $ctx
*
- * @return bool TRUE for success
+ * @return bool
+ * TRUE for success
*/
public static function activityContacts(CRM_Queue_TaskContext $ctx) {
$upgrade = new CRM_Upgrade_Form();
*
* @param CRM_Queue_TaskContext $ctx
*
- * @return bool TRUE for success
+ * @return bool
+ * TRUE for success
* @see http://issues.civicrm.org/jira/browse/CRM-13187
*/
public static function wordReplacements(CRM_Queue_TaskContext $ctx) {
* @param CRM_Queue_TaskContext $ctx
* @param $rev
*
- * @return bool TRUE for success
+ * @return bool
+ * TRUE for success
* @see http://issues.civicrm.org/jira/browse/CRM-13655
*/
public static function wordReplacements_patch(CRM_Queue_TaskContext $ctx, $rev) {
*
* @param bool $rebuildEach
* Whether to perform rebuild after each individual API call.
- * @return array Each item is $params for WordReplacement.create
+ * @return array
+ * Each item is $params for WordReplacement.create
* @see CRM_Core_BAO_WordReplacement::convertConfigArraysToAPIParams
*/
public static function getConfigArraysAsAPIParams($rebuildEach) {
}
- /***
+ /**
* CRM-13998 missing alter statements for civicrm_report_instance
- ***/
+ */
public function updateReportInstanceTable() {
// add civicrm_report_instance.name
$sql = "SELECT count(*) FROM information_schema.columns "
- . "WHERE table_schema = database() AND table_name = 'civicrm_report_instance' AND COLUMN_NAME = 'name' ";
+ . "WHERE table_schema = database() AND table_name = 'civicrm_report_instance' AND COLUMN_NAME = 'name' ";
$res = CRM_Core_DAO::singleValueQuery($sql);
/**
* @param array $params
- * @return bool TRUE if $params is valid
+ * @return bool
+ * TRUE if $params is valid
*/
public static function isValidWordReplacement($params) {
$result = strlen($params['find_word']) <= self::MAX_WORD_REPLACEMENT_SIZE && strlen($params['replace_word']) <= self::MAX_WORD_REPLACEMENT_SIZE;
}
return $result;
}
+
}
projects / civicrm-core.git / blobdiff