summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2015-02-18 01:07:54 +0100
committerLukas Reschke <lukas@owncloud.com>2015-02-18 01:07:54 +0100
commitceaa193df24b72817e6d352b3ad4eeaa24db9a1b (patch)
treefdb41d2c4a0df0539671007802edf17b6428f9a6 /settings
parent5d7d2adcbf3bad8d5c74007fcf132b7868c00437 (diff)
parentb701bbd8c5f6051ec0f4bd360473290cf9ebdf71 (diff)
downloadnextcloud-server-ceaa193df24b72817e6d352b3ad4eeaa24db9a1b.tar.gz
nextcloud-server-ceaa193df24b72817e6d352b3ad4eeaa24db9a1b.zip
Merge pull request #14273 from owncloud/require-at-least-apcu-4-0-6
Use APCu only if available in version 4.0.6 and higher
Diffstat (limited to 'settings')
-rw-r--r--settings/admin.php4
-rw-r--r--settings/templates/admin.php15
2 files changed, 19 insertions, 0 deletions
diff --git a/settings/admin.php b/settings/admin.php
index cdbc2700a8d..32e92edb145 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -85,6 +85,10 @@ $template->assign('databaseOverload', $databaseOverload);
// warn if Windows is used
$template->assign('WindowsWarning', OC_Util::runningOnWindows());
+// warn if outdated version of APCu is used
+$template->assign('ApcuOutdatedWarning',
+ extension_loaded('apcu') && version_compare(phpversion('apc'), '4.0.6') === -1);
+
// add hardcoded forms from the template
$forms = OC_App::getForms('admin');
$l = OC_L10N::get('settings');
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 363b4741b74..1f7eacd746b 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -143,9 +143,24 @@ if ($_['WindowsWarning']) {
</p>
</div>
+
<?php
}
+// APCU Warning if outdated
+if ($_['ApcuOutdatedWarning']) {
+ ?>
+ <div class="section">
+ <h2><?php p($l->t('APCu below version 4.0.6 installed'));?></h2>
+
+ <p class="securitywarning">
+ <?php p($l->t('APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version.')); ?>
+ </p>
+
+ </div>
+
+<?php
+}
// if module fileinfo available?
if (!$_['has_fileinfo']) {
?>