summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo "xoen" Giambelluca <xoen@xoen.org>2010-07-03 19:12:51 +0200
committerAldo "xoen" Giambelluca <xoen@xoen.org>2010-07-03 19:12:51 +0200
commit3f4577189591d84dc92f10c5263d13778f5c3e98 (patch)
tree6659fc77aae2da8a91fcecf230a5c2d2ca390100
parent31df117f1c24f1c61f306a79fd95c6dc371fd05b (diff)
downloadnextcloud-server-3f4577189591d84dc92f10c5263d13778f5c3e98.tar.gz
nextcloud-server-3f4577189591d84dc92f10c5263d13778f5c3e98.zip
Using table prefix preference in 'inc/lib_ocs.php'
-rwxr-xr-xinc/lib_ocs.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/inc/lib_ocs.php b/inc/lib_ocs.php
index 52dc95800ab..c2fe6dba33a 100755
--- a/inc/lib_ocs.php
+++ b/inc/lib_ocs.php
@@ -372,15 +372,17 @@ class OC_OCS {
* @return string xml/json
*/
private static function activityget($format,$page,$pagesize) {
+ global $CONFIG_DBTABLEPREFIX;
+ $dbTableLog = $CONFIG_DBTABLEPREFIX . 'Log';
$user=OC_OCS::checkpassword();
- $result = OC_DB::query('select count(*) as co from log');
+ $result = OC_DB::query("select count(*) as co from $dbTableLog");
$entry=$result->fetchRow();
$totalcount=$entry['co'];
OC_DB::free_result($result);
- $result = OC_DB::select('select id,timestamp,user,type,message from log order by timestamp desc limit '.($page*$pagesize).','.$pagesize);
+ $result = OC_DB::select("select id,timestamp,user,type,message from $dbTableLog order by timestamp desc limit " . ($page*$pagesize) . ",$pagesize");
$itemscount=count($result);
$url='http://'.substr($_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME'],0,-11).'';