aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-07-27 09:13:18 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-07-27 09:13:18 +0200
commit660e36b49b9fc129274e90923628eaabd5f2bd0a (patch)
tree65c78ce4fd5dff8b8e183145210bf9652254bb35
parent59c636e853fb37e46fe1ee7a0955a2aca4543a3e (diff)
parentb344e40acc535250f3a5901e5665d2ddaee065d6 (diff)
downloadnextcloud-server-660e36b49b9fc129274e90923628eaabd5f2bd0a.tar.gz
nextcloud-server-660e36b49b9fc129274e90923628eaabd5f2bd0a.zip
Merge pull request #17882 from owncloud/allow-classes-in-titles
Allow classes in <h2> tags
-rw-r--r--settings/admin.php4
-rw-r--r--settings/personal.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/settings/admin.php b/settings/admin.php
index 533b6152492..551608b5d25 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -197,8 +197,8 @@ if (\OC::$server->getLockingProvider() instanceof NoopLockingProvider) {
}
$formsMap = array_map(function ($form) {
- if (preg_match('%(<h2[^>]*>.*?</h2>)%i', $form, $regs)) {
- $sectionName = str_replace('<h2>', '', $regs[0]);
+ if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
+ $sectionName = str_replace('<h2'.$regs['class'].'>', '', $regs[0]);
$sectionName = str_replace('</h2>', '', $sectionName);
$anchor = strtolower($sectionName);
$anchor = str_replace(' ', '-', $anchor);
diff --git a/settings/personal.php b/settings/personal.php
index f4409e633cf..8823102e01a 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -137,8 +137,8 @@ $formsAndMore[]= ['anchor' => 'passwordform', 'section-name' => $l->t('Personal
$forms=OC_App::getForms('personal');
$formsMap = array_map(function($form){
- if (preg_match('%(<h2[^>]*>.*?</h2>)%i', $form, $regs)) {
- $sectionName = str_replace('<h2>', '', $regs[0]);
+ if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
+ $sectionName = str_replace('<h2'.$regs['class'].'>', '', $regs[0]);
$sectionName = str_replace('</h2>', '', $sectionName);
$anchor = strtolower($sectionName);
$anchor = str_replace(' ', '-', $anchor);