Merge branch 'next' into issue-444-theserapher

MPOS123 · MPOS123 · commit 8c5f8df07ed7 · 2013-09-25T11:40:06.000+02:00
diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php
@@ -17,7 +17,7 @@
   $dDifficulty = $bitcoin->getdifficulty();
   $dNetworkHashrate = $bitcoin->getnetworkhashps();
 } else {
-  $dDifficulty = 0;
+  $dDifficulty = 1;
   $dNetworkHashrate = 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`$dDifficulty = $bitcoin->getdifficulty();`
`18`	`18`	`$dNetworkHashrate = $bitcoin->getnetworkhashps();`
`19`	`19`	`} else {`
`20`		`- $dDifficulty = 0;`
	`20`	`+ $dDifficulty = 1;`
`21`	`21`	`$dNetworkHashrate = 0;`
`22`	`22`	`}`
`23`	`23`