Fix notice when accessing HTML or XML version of a note.

diff --git a/appinfo/application.php b/appinfo/application.php
index 7761eb5a90db76672bd99eb694dcf1c2ea1b9d51..b4de9709f1aead6bb5c2f374092d43acca85cd84 100644 (file)
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -59,6 +59,8 @@ class Application extends App
         $container->registerService(
             'NotesController',
             function($c) {
+                Dependencies::get()->urlGen
+                    = $c->query('ServerContainer')->getURLGenerator();
                 return new \OCA\Grauphel\Controller\NotesController(
                     $c->query('AppName'),
                     $c->query('Request'),

diff --git a/controller/notescontroller.php b/controller/notescontroller.php
index a54cfe31f1c868eefe2c2184fb1856236d0d3942..b81e1627424f4e6d2e2f08b12bb996a54fa3b112 100644 (file)
--- a/controller/notescontroller.php
+++ b/controller/notescontroller.php
@@ -16,6 +16,7 @@ namespace OCA\Grauphel\Controller;
 use \OCP\AppFramework\Controller;
 use \OCP\AppFramework\Http\TemplateResponse;
 use \OCA\Grauphel\Lib\Client;
+use \OCA\Grauphel\Lib\Dependencies;
 use \OCA\Grauphel\Lib\TokenStorage;
 use \OCA\Grauphel\Lib\Response\ErrorResponse;
 
@@ -41,7 +42,8 @@ class NotesController extends Controller
     public function __construct($appName, \OCP\IRequest $request, $user)
     {
         parent::__construct($appName, $request);
-        $this->user   = $user;
+        $this->user = $user;
+        $this->deps = Dependencies::get();
 
         //default http header: we assume something is broken
         header('HTTP/1.0 500 Internal Server Error');
@@ -238,7 +240,7 @@ class NotesController extends Controller
     protected function getNotes()
     {
         $username = $this->user->getUid();
-        $notes  = new \OCA\Grauphel\Lib\NoteStorage($this->urlGen);
+        $notes  = new \OCA\Grauphel\Lib\NoteStorage($this->deps->urlGen);
         $notes->setUsername($username);
         return $notes;
     }