From 10939766de3b6fb677e8acdd74220ad2da612a26 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 18 Jan 2015 22:25:29 +0100 Subject: [PATCH] replace session class --- composer.json | 7 ++++++- composer.lock | 42 ++++++++++++++++++++++++++++++++++++++-- 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 @@ { "type": "vcs", "url": "https://github.com/wallabag/PHP-Flash-Messages" + }, + { + "type": "vcs", + "url": "https://github.com/wallabag/kriss_php5" } ], "require": { @@ -35,6 +39,7 @@ "fabpot/goutte": "2.0.*@dev", "ezyang/htmlpurifier": "dev-master", "mgargano/simplehtmldom": "dev-master", - "wallabag/PHP-Flash-Messages": "dev-master" + "wallabag/PHP-Flash-Messages": "dev-master", + "wallabag/kriss_php5": "dev-master" } } \ 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 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "f5e69c21a929d0997c771526484a9d7e", + "hash": "aaf0d0bb3208c2dfc0b6cc95cbfab5f6", "packages": [ { "name": "ezyang/htmlpurifier", @@ -1336,6 +1336,43 @@ "description": "The Twig Gettext Extractor is Poedit friendly tool which extracts translations from twig templates.", "time": "2013-02-14 16:41:48" }, + { + "name": "wallabag/kriss_php5", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/wallabag/kriss_php5.git", + "reference": "f2dd88621a04828cdeb8d9a59b72fd34c94658b1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wallabag/kriss_php5/zipball/f2dd88621a04828cdeb8d9a59b72fd34c94658b1", + "reference": "f2dd88621a04828cdeb8d9a59b72fd34c94658b1", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "autoload": { + "files": [ + "Session.php" + ] + }, + "authors": [ + { + "name": "Nicolas Lœuillet", + "email": "nicolas@loeuillet.org", + "homepage": "http://www.cdetc.fr" + } + ], + "description": "A simple and smart (or stupid) php5 snippets repository", + "homepage": "https://github.com/wallabag/kriss_php5", + "support": { + "source": "https://github.com/wallabag/kriss_php5/tree/master" + }, + "time": "2015-01-18 21:21:43" + }, { "name": "wallabag/php-flash-messages", "version": "dev-master", @@ -1390,7 +1427,8 @@ "fabpot/goutte": 20, "ezyang/htmlpurifier": 20, "mgargano/simplehtmldom": 20, - "wallabag/php-flash-messages": 20 + "wallabag/php-flash-messages": 20, + "wallabag/kriss_php5": 20 }, "prefer-stable": false, "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'; require_once INCLUDES . '/poche/Database.class.php'; require_once INCLUDES . '/3rdparty/paginator.php'; -require_once INCLUDES . '/3rdparty/Session.class.php'; require_once INCLUDES . '/3rdparty/libraries/feedwriter/FeedItem.php'; require_once INCLUDES . '/3rdparty/libraries/feedwriter/FeedWriter.php'; -- 2.41.0