From 4bf51fc8e0ce6facc2a2b8037b3dd1f444121c17 Mon Sep 17 00:00:00 2001
From: modus75 <modus75@users.noreply.github.com>
Date: Sat, 16 Jan 2016 17:20:43 +0100
Subject: shorten some code (not really important)

---
 include/functions.inc.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'include/functions.inc.php')

diff --git a/include/functions.inc.php b/include/functions.inc.php
index f4422c3a2..0f26fde77 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -1159,9 +1159,7 @@ function l10n_args($key_args, $sep = "\n")
  */
 function get_themeconf($key)
 {
-  global $template;
-
-  return $template->get_themeconf($key);
+  return $GLOBALS['template']->get_themeconf($key);
 }
 
 /**
@@ -1313,12 +1311,7 @@ function conf_get_param($param, $default_value=null)
   {
     return $conf[$param];
   }
-  elseif (isset($default_value))
-  {
-    return $default_value;
-  }
-
-  return null;
+  return $default_value;
 }
 
 
-- 
cgit v1.2.3