aboutsummaryrefslogtreecommitdiffstats
path: root/mod/admin.php
diff options
context:
space:
mode:
authorWave <wave72@users.noreply.github.com>2015-11-25 09:39:44 +0100
committerWave <wave72@users.noreply.github.com>2015-11-25 09:39:44 +0100
commit2de65ab39fc704fd8b7abcf9003ee98e3ffb1cc3 (patch)
tree783f90531c93f498609fb1dbd0e199ca65bb2cc0 /mod/admin.php
parente785b723aad51d4f7202dbbb24a0e2245428cb5b (diff)
parent0559db9cf81267c34ca014fef1aebe1cf31de2ab (diff)
downloadvolse-hubzilla-2de65ab39fc704fd8b7abcf9003ee98e3ffb1cc3.tar.gz
volse-hubzilla-2de65ab39fc704fd8b7abcf9003ee98e3ffb1cc3.tar.bz2
volse-hubzilla-2de65ab39fc704fd8b7abcf9003ee98e3ffb1cc3.zip
Merge pull request #3 from redmatrix/master
Update branch
Diffstat (limited to 'mod/admin.php')
-rw-r--r--mod/admin.php12
1 files changed, 9 insertions, 3 deletions
diff --git a/mod/admin.php b/mod/admin.php
index a884b7658..4b7cb3cd9 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -395,9 +395,10 @@ function admin_page_site(&$a) {
}
/* Banner */
+
$banner = get_config('system', 'banner');
- if($banner == false)
- $banner = 'red';
+ if($banner === false)
+ $banner = get_config('system','sitename');
$banner = htmlspecialchars($banner);
@@ -1042,7 +1043,12 @@ function admin_page_plugins(&$a){
}
$admin_form = '';
- if (is_array($a->plugins_admin) && in_array($plugin, $a->plugins_admin)){
+
+ $r = q("select * from addon where plugin_admin = 1 and name = '%s' limit 1",
+ dbesc($plugin)
+ );
+
+ if($r) {
@require_once("addon/$plugin/$plugin.php");
if(function_exists($plugin.'_plugin_admin')) {
$func = $plugin.'_plugin_admin';