From 23b90e2a9277493836b7b176a620dcb6d7bcb02f Mon Sep 17 00:00:00 2001
From: Wojciech Grzebieniowski <w.grzebieniowski@kontakt.io>
Date: Tue, 9 Jun 2015 12:01:11 +0200
Subject: [PATCH] Avoid using global config variable.

Instead config is keeped in Pico::$config private variable, and the
config.php returns $config.
---
 config.php.template |  3 +++
 lib/pico.php        | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/config.php.template b/config.php.template
index 5dfa75b..c0195ee 100644
--- a/config.php.template
+++ b/config.php.template
@@ -49,3 +49,6 @@
  * CUSTOM
  */
 // $config['custom_setting'] = 'Hello';           // Can be accessed by {{ config.custom_setting }} in a theme
+
+// Keep this line
+return $config;
\ No newline at end of file
diff --git a/lib/pico.php b/lib/pico.php
index 9a5c8a6..2fb9c96 100644
--- a/lib/pico.php
+++ b/lib/pico.php
@@ -10,6 +10,7 @@
  */
 class Pico {
 
+	private $config;
 	private $plugins;
 
 	/**
@@ -150,7 +151,7 @@ class Pico {
 	 */
 	protected function read_file_meta($content)
 	{
-		global $config;
+		$config = $this->config;
 
 		$headers = array(
 			'title'       	=> 'Title',
@@ -184,8 +185,8 @@ class Pico {
 	 */
 	protected function get_config()
 	{
-		global $config;
-		@include_once(ROOT_DIR .'config.php');
+
+        $this->config = @include_once(ROOT_DIR .'config.php');
 
 		$defaults = array(
 			'site_title' => 'Pico',
@@ -199,10 +200,10 @@ class Pico {
             'content_dir' => 'content-sample/',
 		);
 
-		if(is_array($config)) $config = array_merge($defaults, $config);
-		else $config = $defaults;
+		if(is_array($this->config)) $this->config = array_merge($defaults, $this->config);
+		else $this->config = $defaults;
 
-		return $config;
+		return $this->config;
 	}
 
 	/**
@@ -215,7 +216,7 @@ class Pico {
 	 */
 	protected function get_pages($base_url, $order_by = 'alpha', $order = 'asc', $excerpt_length = 50)
 	{
-		global $config;
+        $config = $this->config;
 
 		$pages = $this->get_files($config['content_dir'], CONTENT_EXT);
 		$sorted_pages = array();
@@ -292,7 +293,8 @@ class Pico {
 	 */
 	protected function base_url()
 	{
-		global $config;
+        $config = $this->config;
+
 		if(isset($config['base_url']) && $config['base_url']) return $config['base_url'];
 
 		$url = '';