summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-01-20 23:29:04 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-01-20 23:29:04 +0100
commit12081f7ba2089c8046dacac23ebe44ea843d7ef1 (patch)
tree8e3ee558557f5cffc7f5a6ea1b3d9526eac488a2
parent2036b9aed32c5446c31578ad5ff63b2a7a02bbc2 (diff)
Quick fix cron actualization due to problematic FreshRSS constructor/init
https://github.com/FreshRSS/FreshRSS/issues/759 Suggestion: the static objects should be user-independent (or at least with the possibility to be re-set), while the FreshRSS object and its attributes should be user-dependent.
-rwxr-xr-xapp/actualize_script.php3
-rw-r--r--lib/Minz/Configuration.php7
2 files changed, 2 insertions, 8 deletions
diff --git a/app/actualize_script.php b/app/actualize_script.php
index c7959be82..bae40aa56 100755
--- a/app/actualize_script.php
+++ b/app/actualize_script.php
@@ -22,7 +22,6 @@ $_SERVER['HTTP_HOST'] = '';
$app = new FreshRSS();
-$app->init();
$system_conf = Minz_Configuration::get('system');
$system_conf->auth_type = 'none'; // avoid necessity to be logged in (not saved!)
@@ -56,7 +55,9 @@ foreach ($users as $user) {
Minz_Session::_param('currentUser', $user);
+ new Minz_ModelPdo($user); //TODO: FIXME: Quick-fix while waiting for a better FreshRSS() constructor/init
FreshRSS_Auth::giveAccess();
+ $app->init();
$app->run();
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index fe415e22b..ab5bb4fc2 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -16,16 +16,9 @@ class Minz_Configuration {
* @param $config_filename the filename of the configuration
* @param $default_filename a filename containing default values for the configuration
* @param $configuration_setter an optional helper to set values in configuration
- * @throws Minz_ConfigurationNamespaceException if the namespace already exists.
*/
public static function register($namespace, $config_filename, $default_filename = null,
$configuration_setter = null) {
- if (isset(self::$config_list[$namespace])) {
- throw new Minz_ConfigurationNamespaceException(
- $namespace . ' namespace already exists'
- );
- }
-
self::$config_list[$namespace] = new Minz_Configuration(
$namespace, $config_filename, $default_filename, $configuration_setter
);