CRM-15832 - Civi\Angular\Page\Main - Fix PHP 5.3

diff --git a/Civi/Angular/Page/Main.php b/Civi/Angular/Page/Main.php
index e8e2994f86d0c0a2864ee9f764bd5ffd1b95c005..8a4686ef6445ec0d3b692f45f080e50733ac4362 100644 (file)
--- a/Civi/Angular/Page/Main.php
+++ b/Civi/Angular/Page/Main.php
@@ -14,15 +14,23 @@ class Main extends \CRM_Core_Page {
   const DEFAULT_MODULE_WEIGHT = 200;
 
   /**
+   * The resource manager.
+   *
+   * Do not use publicly. Inject your own copy!
+   *
    * @var \CRM_Core_Resources
    */
-  protected $res;
+  public $res;
 
 
   /**
+   * The Angular module manager.
+   *
+   * Do not use publicly. Inject your own copy!
+   *
    * @var \Civi\Angular\Manager
    */
-  protected $angular;
+  public $angular;
 
   /**
    * @param string $title
@@ -56,14 +64,15 @@ class Main extends \CRM_Core_Page {
    */
   public function registerResources() {
     $modules = $this->angular->getModules();
+    $page = $this; // PHP 5.3 does not propagate $this to inner functions.
 
-    $this->res->addSettingsFactory(function () use (&$modules) {
+    $this->res->addSettingsFactory(function () use (&$modules, $page) {
       // TODO optimization; client-side caching
       return array(
         'resourceUrls' => \CRM_Extension_System::singleton()->getMapper()->getActiveModuleUrls(),
         'angular' => array(
           'modules' => array_merge(array('ngRoute'), array_keys($modules)),
-          'cacheCode' => $this->res->getCacheCode(),
+          'cacheCode' => $page->res->getCacheCode(),
         ),
         'crmAttachment' => array(
           'token' => \CRM_Core_Page_AJAX_Attachment::createToken(),