diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2013-03-01 23:41:23 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2013-03-01 23:41:23 +0100 |
| commit | fadb11253b8c3f531d70892bb5f6061dd6bdc338 (patch) | |
| tree | 108d2c90ad70e7eba668c82e070c9b8c4da4d9fd /settings/templates/help.php | |
| parent | f9b454dab10b48df3c64c31ce706169f9bf703bf (diff) | |
| parent | 8e5bbace718ad0c9fd9ccb7aa699cad8c34f5eea (diff) | |
| download | nextcloud-server-fadb11253b8c3f531d70892bb5f6061dd6bdc338.tar.gz nextcloud-server-fadb11253b8c3f531d70892bb5f6061dd6bdc338.zip | |
Merge branch 'master' into fixing-bugtracker-link-master
Conflicts:
core/templates/exception.php
settings/templates/help.php
Diffstat (limited to 'settings/templates/help.php')
| -rw-r--r-- | settings/templates/help.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/settings/templates/help.php b/settings/templates/help.php index 3d56fcd4b40..3739d220e6e 100644 --- a/settings/templates/help.php +++ b/settings/templates/help.php @@ -1,21 +1,21 @@ <div id="controls"> <?php if($_['admin']) { ?> - <a class="button newquestion <?php echo($_['style1']); ?>" - href="<?php echo($_['url1']); ?>"><?php echo $l->t( 'User Documentation' ); ?></a> - <a class="button newquestion <?php echo($_['style2']); ?>" - href="<?php echo($_['url2']); ?>"><?php echo $l->t( 'Administrator Documentation' ); ?></a> + <a class="button newquestion <?php p($_['style1']); ?>" + href="<?php print_unescaped($_['url1']); ?>"><?php p($l->t( 'User Documentation' )); ?></a> + <a class="button newquestion <?php p($_['style2']); ?>" + href="<?php print_unescaped($_['url2']); ?>"><?php p($l->t( 'Administrator Documentation' )); ?></a> <?php } ?> <a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php - echo $l->t( 'Online Documentation' ); ?></a> + p($l->t( 'Online Documentation' )); ?></a> <a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php - echo $l->t( 'Forum' ); ?></a> + p($l->t( 'Forum' )); ?></a> <?php if($_['admin']) { ?> <a class="button newquestion" href="https://github.com/owncloud/core/blob/master/CONTRIBUTING.md" target="_blank"><?php - echo $l->t( 'Bugtracker' ); ?></a> + p($l->t( 'Bugtracker' )); ?></a> <?php } ?> <a class="button newquestion" href="http://owncloud.com" target="_blank"><?php - echo $l->t( 'Commercial Support' ); ?></a> + p($l->t( 'Commercial Support' )); ?></a> </div> <div class="help-includes"> - <iframe src="<?php echo($_['url']); ?>" class="help-iframe">abc</iframe> + <iframe src="<?php print_unescaped($_['url']); ?>" class="help-iframe">abc</iframe> </div> |