From 29bf5c84fef873364fc9fe2d33334924b8097427 Mon Sep 17 00:00:00 2001 From: Andreas Bielawski Date: Wed, 3 Aug 2016 19:21:07 +0200 Subject: [PATCH] Nutze wieder dkjson, sorry! --- README.md | 2 +- otouto/utilities.lua | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 09cfd01..2c652c5 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Du benötigst **Lua 5.2+**, eine aktive **Redis-Instanz** und die folgenden **Lu * luasocket * luasec * multipart-post -* lua-cjson +* dkjson * lpeg * redis-lua * fakeredis diff --git a/otouto/utilities.lua b/otouto/utilities.lua index 9d6b497..1ff3be4 100644 --- a/otouto/utilities.lua +++ b/otouto/utilities.lua @@ -8,7 +8,8 @@ http = require('socket.http') https = require('ssl.https') socket = require('socket') URL = require('socket.url') -json = require "cjson" +json = require("dkjson") +pcall(json.use_lpeg) serpent = require("serpent") bindings = require('otouto.bindings') redis = (loadfile "./otouto/redis.lua")() @@ -259,7 +260,7 @@ function string:isempty() return self == nil or self == '' end --- Retruns true if the string is blank +-- Returns true if the string is blank function string:isblank() self = self:trim() return self:isempty()