jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405269 )

Change subject: FlexiSkin: Update Path Build on Logo directory interator to 
prevent lookup error on special data and image paths (non default config)
......................................................................


FlexiSkin: Update Path Build on Logo directory interator to prevent lookup 
error on special data and image paths (non default config)

Change-Id: If0df06552975e481ba79498f5cfee0383286acfd
---
M Flexiskin/includes/api/BSApiFlexiskinUploadStore.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Flexiskin/includes/api/BSApiFlexiskinUploadStore.php 
b/Flexiskin/includes/api/BSApiFlexiskinUploadStore.php
index bcc2705..68f7f9e 100644
--- a/Flexiskin/includes/api/BSApiFlexiskinUploadStore.php
+++ b/Flexiskin/includes/api/BSApiFlexiskinUploadStore.php
@@ -39,7 +39,7 @@
 
                $flexiskinFiles = new RecursiveIteratorIterator(
                        new RecursiveDirectoryIterator(
-                               $wgUploadDirectory.'/bluespice/flexiskin/' . 
$sQuery . '/images/',
+                               BsFileSystemHelper::getDataDirectory( 
'flexiskin/' . $sQuery . '/images/' ),
                                ( RecursiveIteratorIterator::SELF_FIRST | 
RecursiveDirectoryIterator::SKIP_DOTS )
                        )
                );
@@ -55,4 +55,4 @@
 
                return $aData;
        }
-}
\ No newline at end of file
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/405269
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If0df06552975e481ba79498f5cfee0383286acfd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: Ljonka <l.verhovs...@gmail.com>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to