Move the addon-specific config in config/addon.ini.php

- Add sample addon.ini.php file
- Add config/addon.ini.php file to git ignore

diff --git a/.gitignore b/.gitignore
index c1eb430b4b98f7d597b4e22bd7ddcdd33e148de4..114bb5dbb9a5054ca0d1c71fcdb054979c15a176 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ robots.txt
 
 #ignore local config
 /config/local.ini.php
+/config/addon.ini.php
 
 #ignore documentation, it should be newly built
 /doc/html

diff --git a/config/addon-sample.ini.php b/config/addon-sample.ini.php
new file mode 100644 (file)
index 0000000..7d8054c
--- /dev/null
+++ b/config/addon-sample.ini.php
@@ -0,0 +1,10 @@
+<?php return <<<INI
+
+; Copy this configuration file to addon.ini.php and edit it if you want to configure addons, see below example for the twitter addon
+
+;[twitter]
+;consumerkey = localhost
+;consumersecret = mysqlusername
+
+INI;
+// Keep this line
\ No newline at end of file

diff --git a/src/App.php b/src/App.php
index 8bde1afc4327ec4301db42d188b0b52e0eb4e26c..e495f48dd4e0e828f6bfd991c67258a8f76351f8 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -403,9 +403,9 @@ class App
                // Loads addons default config
                Core\Addon::callHooks('load_config');
 
-               // Load the local config file again in case there are overwritten addon config
-               if (file_exists($this->basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.ini.php')) {
-                       $this->loadConfigFile($this->basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.ini.php');
+               // Load the local addon config file to overwritten default addon config values
+               if (file_exists($this->basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'addon.ini.php')) {
+                       $this->loadConfigFile($this->basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'addon.ini.php');
                }
        }