diff options
author | alexichi <alexbankai96@gmail.com> | 2016-04-25 10:43:56 +0200 |
---|---|---|
committer | alexichi <alexbankai96@gmail.com> | 2016-04-25 10:43:56 +0200 |
commit | 1ffba62faae83e18597270b68580a90ac3032a31 (patch) | |
tree | 603d33ed48a9dd3690aeef379eeb7fd8ce3a257f /inc/mine.inc | |
parent | 3ece645cc83e36aaa36c0258afa0f1b36eb13ca2 (diff) | |
parent | dc28807625b9f53e621ec0d7063d99c2527cfa02 (diff) | |
download | candybox-1ffba62faae83e18597270b68580a90ac3032a31.tar.gz candybox-1ffba62faae83e18597270b68580a90ac3032a31.tar.bz2 candybox-1ffba62faae83e18597270b68580a90ac3032a31.tar.xz candybox-1ffba62faae83e18597270b68580a90ac3032a31.zip |
Merge remote-tracking branch 'origin/piernov' into alexichi
Conflicts:
craftmine.php
index.xhtml
Diffstat (limited to 'inc/mine.inc')
-rw-r--r-- | inc/mine.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/mine.inc b/inc/mine.inc index a2ecd09..94a2c66 100644 --- a/inc/mine.inc +++ b/inc/mine.inc @@ -8,13 +8,13 @@ function withdrawMine() { $amount = intval($_POST["amount"]); if($amount == 0) return; $_SESSION["mine"]["gold"] += $amount; - echo $_SESSION["mine"]["gold"]; + echo json_encode($_SESSION["mine"]["gold"]); } function sendMine() { if(empty($_SESSION["mine"])) initCraftMine(); $mine = $_SESSION["mine"]; - echo $mine["gold"]; + return $mine["gold"]; } |