diff options
-rw-r--r-- | composer.json | 7 | ||||
-rw-r--r-- | composer.lock | 42 | ||||
-rwxr-xr-x | inc/poche/global.inc.php | 1 |
3 files changed, 46 insertions, 4 deletions
diff --git a/composer.json b/composer.json index 3bb7bf07..56dea960 100644 --- a/composer.json +++ b/composer.json | |||
@@ -26,6 +26,10 @@ | |||
26 | { | 26 | { |
27 | "type": "vcs", | 27 | "type": "vcs", |
28 | "url": "https://github.com/wallabag/PHP-Flash-Messages" | 28 | "url": "https://github.com/wallabag/PHP-Flash-Messages" |
29 | }, | ||
30 | { | ||
31 | "type": "vcs", | ||
32 | "url": "https://github.com/wallabag/kriss_php5" | ||
29 | } | 33 | } |
30 | ], | 34 | ], |
31 | "require": { | 35 | "require": { |
@@ -35,6 +39,7 @@ | |||
35 | "fabpot/goutte": "2.0.*@dev", | 39 | "fabpot/goutte": "2.0.*@dev", |
36 | "ezyang/htmlpurifier": "dev-master", | 40 | "ezyang/htmlpurifier": "dev-master", |
37 | "mgargano/simplehtmldom": "dev-master", | 41 | "mgargano/simplehtmldom": "dev-master", |
38 | "wallabag/PHP-Flash-Messages": "dev-master" | 42 | "wallabag/PHP-Flash-Messages": "dev-master", |
43 | "wallabag/kriss_php5": "dev-master" | ||
39 | } | 44 | } |
40 | } \ No newline at end of file | 45 | } \ No newline at end of file |
diff --git a/composer.lock b/composer.lock index a984ce52..48df2b16 100644 --- a/composer.lock +++ b/composer.lock | |||
@@ -4,7 +4,7 @@ | |||
4 | "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", | 4 | "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", |
5 | "This file is @generated automatically" | 5 | "This file is @generated automatically" |
6 | ], | 6 | ], |
7 | "hash": "f5e69c21a929d0997c771526484a9d7e", | 7 | "hash": "aaf0d0bb3208c2dfc0b6cc95cbfab5f6", |
8 | "packages": [ | 8 | "packages": [ |
9 | { | 9 | { |
10 | "name": "ezyang/htmlpurifier", | 10 | "name": "ezyang/htmlpurifier", |
@@ -1337,6 +1337,43 @@ | |||
1337 | "time": "2013-02-14 16:41:48" | 1337 | "time": "2013-02-14 16:41:48" |
1338 | }, | 1338 | }, |
1339 | { | 1339 | { |
1340 | "name": "wallabag/kriss_php5", | ||
1341 | "version": "dev-master", | ||
1342 | "source": { | ||
1343 | "type": "git", | ||
1344 | "url": "https://github.com/wallabag/kriss_php5.git", | ||
1345 | "reference": "f2dd88621a04828cdeb8d9a59b72fd34c94658b1" | ||
1346 | }, | ||
1347 | "dist": { | ||
1348 | "type": "zip", | ||
1349 | "url": "https://api.github.com/repos/wallabag/kriss_php5/zipball/f2dd88621a04828cdeb8d9a59b72fd34c94658b1", | ||
1350 | "reference": "f2dd88621a04828cdeb8d9a59b72fd34c94658b1", | ||
1351 | "shasum": "" | ||
1352 | }, | ||
1353 | "require": { | ||
1354 | "php": ">=5.3.0" | ||
1355 | }, | ||
1356 | "type": "library", | ||
1357 | "autoload": { | ||
1358 | "files": [ | ||
1359 | "Session.php" | ||
1360 | ] | ||
1361 | }, | ||
1362 | "authors": [ | ||
1363 | { | ||
1364 | "name": "Nicolas LÅ“uillet", | ||
1365 | "email": "nicolas@loeuillet.org", | ||
1366 | "homepage": "http://www.cdetc.fr" | ||
1367 | } | ||
1368 | ], | ||
1369 | "description": "A simple and smart (or stupid) php5 snippets repository", | ||
1370 | "homepage": "https://github.com/wallabag/kriss_php5", | ||
1371 | "support": { | ||
1372 | "source": "https://github.com/wallabag/kriss_php5/tree/master" | ||
1373 | }, | ||
1374 | "time": "2015-01-18 21:21:43" | ||
1375 | }, | ||
1376 | { | ||
1340 | "name": "wallabag/php-flash-messages", | 1377 | "name": "wallabag/php-flash-messages", |
1341 | "version": "dev-master", | 1378 | "version": "dev-master", |
1342 | "source": { | 1379 | "source": { |
@@ -1390,7 +1427,8 @@ | |||
1390 | "fabpot/goutte": 20, | 1427 | "fabpot/goutte": 20, |
1391 | "ezyang/htmlpurifier": 20, | 1428 | "ezyang/htmlpurifier": 20, |
1392 | "mgargano/simplehtmldom": 20, | 1429 | "mgargano/simplehtmldom": 20, |
1393 | "wallabag/php-flash-messages": 20 | 1430 | "wallabag/php-flash-messages": 20, |
1431 | "wallabag/kriss_php5": 20 | ||
1394 | }, | 1432 | }, |
1395 | "prefer-stable": false, | 1433 | "prefer-stable": false, |
1396 | "prefer-lowest": false, | 1434 | "prefer-lowest": false, |
diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php index 3e04b383..4d119456 100755 --- a/inc/poche/global.inc.php +++ b/inc/poche/global.inc.php | |||
@@ -26,7 +26,6 @@ require_once INCLUDES . '/poche/Poche.class.php'; | |||
26 | 26 | ||
27 | require_once INCLUDES . '/poche/Database.class.php'; | 27 | require_once INCLUDES . '/poche/Database.class.php'; |
28 | require_once INCLUDES . '/3rdparty/paginator.php'; | 28 | require_once INCLUDES . '/3rdparty/paginator.php'; |
29 | require_once INCLUDES . '/3rdparty/Session.class.php'; | ||
30 | 29 | ||
31 | require_once INCLUDES . '/3rdparty/libraries/feedwriter/FeedItem.php'; | 30 | require_once INCLUDES . '/3rdparty/libraries/feedwriter/FeedItem.php'; |
32 | require_once INCLUDES . '/3rdparty/libraries/feedwriter/FeedWriter.php'; | 31 | require_once INCLUDES . '/3rdparty/libraries/feedwriter/FeedWriter.php'; |