From 70cea18cce0fcdb4d8118ff2d7abccc922417a6a Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Tue, 1 May 2012 18:50:31 +0200 Subject: ported getUser --- apps/bookmarks/ajax/delBookmark.php | 2 +- apps/bookmarks/ajax/recordClick.php | 2 +- apps/bookmarks/bookmarksHelper.php | 2 +- apps/bookmarks/lib/bookmarks.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 apps/bookmarks/ajax/delBookmark.php mode change 100644 => 100755 apps/bookmarks/ajax/recordClick.php mode change 100644 => 100755 apps/bookmarks/bookmarksHelper.php (limited to 'apps/bookmarks') diff --git a/apps/bookmarks/ajax/delBookmark.php b/apps/bookmarks/ajax/delBookmark.php old mode 100644 new mode 100755 index 655d9f825d9..984a8593169 --- a/apps/bookmarks/ajax/delBookmark.php +++ b/apps/bookmarks/ajax/delBookmark.php @@ -32,7 +32,7 @@ OC_JSON::checkAppEnabled('bookmarks'); $params=array( htmlspecialchars_decode($_GET["url"]), - OC_User::getUser() + OCP\USER::getUser() ); $query = OC_DB::prepare(" diff --git a/apps/bookmarks/ajax/recordClick.php b/apps/bookmarks/ajax/recordClick.php old mode 100644 new mode 100755 index a542f636d8c..6519de241b6 --- a/apps/bookmarks/ajax/recordClick.php +++ b/apps/bookmarks/ajax/recordClick.php @@ -37,7 +37,7 @@ $query = OC_DB::prepare(" AND url LIKE ? "); -$params=array(OC_User::getUser(), htmlspecialchars_decode($_GET["url"])); +$params=array(OCP\USER::getUser(), htmlspecialchars_decode($_GET["url"])); $bookmarks = $query->execute($params); header( "HTTP/1.1 204 No Content" ); diff --git a/apps/bookmarks/bookmarksHelper.php b/apps/bookmarks/bookmarksHelper.php old mode 100644 new mode 100755 index f1464be79de..25c9b4cc7f2 --- a/apps/bookmarks/bookmarksHelper.php +++ b/apps/bookmarks/bookmarksHelper.php @@ -101,7 +101,7 @@ function addBookmark($url, $title, $tags='') { $params=array( htmlspecialchars_decode($url), htmlspecialchars_decode($title), - OC_User::getUser() + OCP\USER::getUser() ); $query->execute($params); diff --git a/apps/bookmarks/lib/bookmarks.php b/apps/bookmarks/lib/bookmarks.php index b1ff1f411f2..3f27af09557 100755 --- a/apps/bookmarks/lib/bookmarks.php +++ b/apps/bookmarks/lib/bookmarks.php @@ -37,7 +37,7 @@ class OC_Bookmarks_Bookmarks{ //OCP\Util::writeLog('bookmarks', 'findBookmarks ' .$offset. ' '.$sqlSortColumn.' '. $filter.' '. $filterTagOnly ,OCP\Util::DEBUG); $CONFIG_DBTYPE = OC_Config::getValue( 'dbtype', 'sqlite' ); - $params=array(OC_User::getUser()); + $params=array(OCP\USER::getUser()); if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){ $_gc_separator = ', \' \''; -- cgit v1.2.3