diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-02-25 16:54:27 +0100 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-02-25 16:54:27 +0100 |
| commit | bfb67286c85806fdd4293b60936d5cdedee2e702 (patch) | |
| tree | 7136c53adb6c7196c84b2b2295a781e697fa42a9 /apps/gallery/appinfo/app.php | |
| parent | 9460c9e907f1dd80e4978e23911975bc775e7260 (diff) | |
| parent | 3cf81cadd5535b0516d73fe3de8ee91f330b4a6f (diff) | |
| download | nextcloud-server-bfb67286c85806fdd4293b60936d5cdedee2e702.tar.gz nextcloud-server-bfb67286c85806fdd4293b60936d5cdedee2e702.zip | |
fix merge conflicts
Diffstat (limited to 'apps/gallery/appinfo/app.php')
| -rw-r--r-- | apps/gallery/appinfo/app.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php index da872274497..b8de32ea587 100644 --- a/apps/gallery/appinfo/app.php +++ b/apps/gallery/appinfo/app.php @@ -46,7 +46,7 @@ OC_App::addNavigationEntry( array( $result = $stmt->execute(array(OC_User::getUser(),'%'.$query.'%')); $results=array(); while($row=$result->fetchRow()){ - $results[]=new OC_Search_Result($row['album_name'],'',OC_Helper::linkTo('apps/gallery', 'index.php?view='.$row['album_name']),'Galleries'); + $results[]=new OC_Search_Result($row['album_name'],'',OC_Helper::linkTo('gallery', 'index.php').'?view='.$row['album_name'],'Galleries'); } return $results; } |