projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo Fix
[civicrm-core.git]
/
CRM
/
Upgrade
/
Incremental
/
php
/
FourFour.php
diff --git
a/CRM/Upgrade/Incremental/php/FourFour.php
b/CRM/Upgrade/Incremental/php/FourFour.php
index af2a61d3a00a04b025f6b138e84300d217e18ee5..0a887b1258789ee0297f28e9553bf9a06d02a5c3 100644
(file)
--- a/
CRM/Upgrade/Incremental/php/FourFour.php
+++ b/
CRM/Upgrade/Incremental/php/FourFour.php
@@
-378,13
+378,17
@@
ALTER TABLE civicrm_dashboard
static function upgradeImageUrls(CRM_Queue_TaskContext $ctx, $startId, $endId){
$dao = self::findContactImageUrls($startId, $endId);
$failures = array();
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;
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);
$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.
$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.