Update controller.php

Backwards compability fix for faster merge ;)

diff --git a/lib/public/appframework/controller.php b/lib/public/appframework/controller.php
index 81dc568e53adeee67d5e014268f4269049db52b7..93f4d2ff5d3f9d75aafc5b4f6bdec3f77e3c4fb5 100644 (file)
--- a/lib/public/appframework/controller.php
+++ b/lib/public/appframework/controller.php
@@ -49,13 +49,21 @@ abstract class Controller {
         */
        protected $request;
 
+       protected $app; // removed in oc7, backwards compability change for oc 6
+
        /**
         * constructor of the controller
         * @param string $appName the name of the app
         * @param IRequest $request an instance of the request
         */
        public function __construct($appName, IRequest $request){
-               $this->appName = $appName;
+               // backwards compatibility fix, removed in oc7
+               if($appName instanceof IAppContainer) {
+                       $this->appName = $appName->getAppName();
+                       $this->app = $appName;
+               } else {
+                       $this->appName = $appName;      
+               }
                $this->request = $request;
        }