diff options
author | Pascal Chevrel <pascal@chevrel.org> | 2012-03-08 11:49:38 +0100 |
---|---|---|
committer | Pascal Chevrel <pascal@chevrel.org> | 2012-03-08 11:49:38 +0100 |
commit | 60b537a088b2052896447a078948748ea43084a6 (patch) | |
tree | 537418ccbda4d78eb3312795b84d92b43aaeab3c /admin | |
parent | 41ec00699d5f86cc868984600d3676821caed83f (diff) | |
download | planet-60b537a088b2052896447a078948748ea43084a6.tar planet-60b537a088b2052896447a078948748ea43084a6.tar.gz planet-60b537a088b2052896447a078948748ea43084a6.tar.bz2 planet-60b537a088b2052896447a078948748ea43084a6.tar.xz planet-60b537a088b2052896447a078948748ea43084a6.zip |
fix install process and admin section which are currently broken because of the separation of classes in separate files. Now the files calling those classes are including app/app.php, also, I changed the variable name in the installation wizard to so as to avoid confusion with already used in the admin section
Diffstat (limited to 'admin')
-rwxr-xr-x[-rw-r--r--] | admin/index.php | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | admin/subscriptions.php | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/admin/index.php b/admin/index.php index b075206..1a43020 100644..100755 --- a/admin/index.php +++ b/admin/index.php @@ -1,7 +1,7 @@ <?php
require_once dirname(__FILE__) . '/inc/auth.inc.php';
-require_once(dirname(__FILE__) . '/../app/classes/Planet.class.php');
+require_once dirname(__FILE__) . '/../app/app.php';
//Load configuration
$config_file = dirname(__FILE__) . '/../custom/config.yml';
diff --git a/admin/subscriptions.php b/admin/subscriptions.php index 0b25bde..ea2f113 100644..100755 --- a/admin/subscriptions.php +++ b/admin/subscriptions.php @@ -1,10 +1,6 @@ <?php -require_once dirname(__FILE__).'/inc/auth.inc.php'; - -include_once(dirname(__FILE__).'/../app/classes/Planet.class.php'); -include_once(dirname(__FILE__).'/../app/lib/spyc-0.5/spyc.php'); -require_once dirname(__FILE__).'/../app/lib/lib.opml.php'; -require_once dirname(__FILE__).'/../app/lib/simplepie/simplepie.inc'; +require_once dirname(__FILE__) . '/inc/auth.inc.php'; +require_once dirname(__FILE__) . '/../app/app.php'; function removeSlashes(&$item, $key){ $item = stripslashes($item); |