diff options
| author | Christian Reiner <github@christian-reiner.info> | 2014-11-24 23:47:13 +0300 |
|---|---|---|
| committer | Christian Reiner <github@christian-reiner.info> | 2014-11-24 23:47:13 +0300 |
| commit | 2bef12017f1d50f8e4932696227588a63834a630 (patch) | |
| tree | a7d13756d09fdafa99d4bcef1868627bbb4ebd9d /imprint | |
| parent | e3b9bd03c6206c250a0828e0e1ba701bd4d4cd0c (diff) | |
| parent | 7de6291d10af55b58cb59173986365dafb888967 (diff) | |
Merge pull request #1984 from arkascha/master
Imprint: version 0.2.2: fix crash for non privileged users before content has been configured.
Diffstat (limited to 'imprint')
| -rw-r--r-- | imprint/appinfo/info.xml | 2 | ||||
| -rw-r--r-- | imprint/appinfo/version | 2 | ||||
| -rw-r--r-- | imprint/content.php | 2 | ||||
| -rw-r--r-- | imprint/doc/CHANGELOG | 4 | ||||
| -rw-r--r-- | imprint/templates/tmpl_content.php | 3 | ||||
| -rw-r--r-- | imprint/templates/tmpl_dummy.php | 6 |
6 files changed, 9 insertions, 10 deletions
diff --git a/imprint/appinfo/info.xml b/imprint/appinfo/info.xml index 31dccdeec..1a0d1fe63 100644 --- a/imprint/appinfo/info.xml +++ b/imprint/appinfo/info.xml @@ -38,7 +38,7 @@ The imprints content can be configured using plain text or html markup. The app is simple but sufficient for the purpose. </description> - <version>0.2.1</version> + <version>0.2.2</version> <licence>AGPL</licence> <author>Christian Reiner</author> <requiremin>7</requiremin> diff --git a/imprint/appinfo/version b/imprint/appinfo/version index 0c62199f1..ee1372d33 100644 --- a/imprint/appinfo/version +++ b/imprint/appinfo/version @@ -1 +1 @@ -0.2.1 +0.2.2 diff --git a/imprint/content.php b/imprint/content.php index 621888ec8..c2cb77564 100644 --- a/imprint/content.php +++ b/imprint/content.php @@ -53,7 +53,7 @@ if (strlen($content)!=strlen(strip_tags($content))) { // output processed content \OCP\Util::addStyle ('imprint', 'content'); $tmpl = new \OCP\Template('imprint', 'tmpl_content'); -$tmpl->assign('processed-content', $processed_content); +$tmpl->assign('content', $processed_content); // render template $tmpl->printPage(); diff --git a/imprint/doc/CHANGELOG b/imprint/doc/CHANGELOG index 4f6f9a9c5..745c5f4da 100644 --- a/imprint/doc/CHANGELOG +++ b/imprint/doc/CHANGELOG @@ -21,6 +21,10 @@ ***** Changelog: + +* Mon Nov 24 2014 Christian Reiner: version 0.2.2 +Fix crash for non privileged users when no content has been configured before. +Removed stale reference to obsolete internal style sheet definition. * Sat Nov 02 2014 Christian Reiner: version 0.2.1 Rendering of markdown as alternative to html markup and plain text. * Tue Oct 28 2014 Christian Reiner: version 0.2.0 diff --git a/imprint/templates/tmpl_content.php b/imprint/templates/tmpl_content.php index b065720c5..317ca3549 100644 --- a/imprint/templates/tmpl_content.php +++ b/imprint/templates/tmpl_content.php @@ -35,11 +35,10 @@ <html> <head> <link rel="stylesheet" href="<?php p(\OCP\Util::linkTo('imprint','css/content.css'));?>" type="text/css" media="screen" /> - <link rel="stylesheet" href="<?php p(\OCP\Util::linkTo('imprint','css/imprint.css'));?>" type="text/css" media="screen" /> </head> <body id="imprint-body"> <div id="imprint-content"> - <?php print_unescaped($_['processed-content']); ?> + <?php print_unescaped($_['content']); ?> </div> </body> </html> diff --git a/imprint/templates/tmpl_dummy.php b/imprint/templates/tmpl_dummy.php index 5c023d42d..d1727d299 100644 --- a/imprint/templates/tmpl_dummy.php +++ b/imprint/templates/tmpl_dummy.php @@ -38,8 +38,4 @@ ----- -_<?php if ( OCP\User::checkAdminUser() ) { - p($l->t("That configuration is done in the administration section.")); -} else { - p($l->t("That configuration has to be done by the system administration.")); -} ?>_ +_<?php p($l->t("That configuration has to be done by the system administration.")); ?>_ |