aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorjeroenpraat <jeroenpraat@xs4all.nl>2016-02-25 02:05:16 +0100
committerjeroenpraat <jeroenpraat@xs4all.nl>2016-02-25 02:05:16 +0100
commitf12b0fe316a4a1c285935a30b282ef82c1b0f6a5 (patch)
treee95c1d6d5fb64315fa3afedf3132daf6fbeaaac5 /view
parent8944d7a7a226601e4b32ea7f7febc166a3ce272d (diff)
parent6300f47cdcd921141b8f98b71d373d53aa3d80f2 (diff)
downloadvolse-hubzilla-f12b0fe316a4a1c285935a30b282ef82c1b0f6a5.tar.gz
volse-hubzilla-f12b0fe316a4a1c285935a30b282ef82c1b0f6a5.tar.bz2
volse-hubzilla-f12b0fe316a4a1c285935a30b282ef82c1b0f6a5.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla
Diffstat (limited to 'view')
-rw-r--r--view/en-au/update_fail_eml.tpl2
-rwxr-xr-xview/tpl/admin_plugins_details.tpl3
2 files changed, 4 insertions, 1 deletions
diff --git a/view/en-au/update_fail_eml.tpl b/view/en-au/update_fail_eml.tpl
index 61f44b1e6..86bb61aaa 100644
--- a/view/en-au/update_fail_eml.tpl
+++ b/view/en-au/update_fail_eml.tpl
@@ -4,7 +4,7 @@ I'm the web server at {{$sitename}};
The Hubzilla developers released update {{$update}} recently,
but when I tried to install it, something went terribly wrong.
This needs to be fixed soon and it requires human intervention.
-Please contact a Red developer if you can not figure out how to
+Please contact a project developer if you can not figure out how to
fix it on your own. My database might be invalid.
The error message is '{{$error}}'.
diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl
index 721bd3573..5d9e233f9 100755
--- a/view/tpl/admin_plugins_details.tpl
+++ b/view/tpl/admin_plugins_details.tpl
@@ -24,6 +24,9 @@
{{if $info.minphpversion}}
<p class="versionlimit">{{$str_minphpversion}}{{$info.minphpversion}}</p>
{{/if}}
+ {{if $info.requires}}
+ <p class="versionlimit">{{$str_requires}}{{$info.requires}}</p>
+ {{/if}}
{{foreach $info.maintainer as $a}}