Partial support for PHP 5.4

Bindings portions of the patch re #10504
MythTV · Jun 14, 2012 · cd670ec · cd670ec
1 parent 79dc4b5
commit cd670ec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/mythtv/bindings/php/MythBackend.php b/mythtv/bindings/php/MythBackend.php
@@ -206,14 +206,14 @@ public function queryProgramRows($query = null, $offset = 1) {
 /**/
     public function rescheduleRecording($recordid = -1) {
         if ($recordid == 0) {
-            $this->sendCommand(array('RESCHEDULE_RECORDINGS ', 
+            $this->sendCommand(array('RESCHEDULE_RECORDINGS ',
                                      'CHECK 0 0 0 PHP',
                                      '', '', '', '**any**'));
         }
         else {
             if ($recordid == -1)
                 $recordid = 0;
-            $this->sendCommand(array('RESCHEDULE_RECORDINGS ', 
+            $this->sendCommand(array('RESCHEDULE_RECORDINGS ',
                                      'MATCH '.$recordid.' 0 0 - PHP'));
         }
         Cache::clear();
@@ -241,7 +241,7 @@ public function httpRequestAsJson($path, $args = array(), $opts = null) {
        }
 
        $opts['http']['header'] = "Accept: application/json\r\n";
-       
+
        return $this->httpRequest($path, $args, $opts);
    }
 

diff --git a/mythtv/bindings/php/MythBase.php b/mythtv/bindings/php/MythBase.php
@@ -47,7 +47,7 @@ public function clearCache() {
 
     public function __destruct() {
         if (!is_null($this->cacheKey))
-            Cache::setObject($this->cacheKey, &$this, $this->cacheLifetime);
+            Cache::setObject($this->cacheKey, $this, $this->cacheLifetime);
         $this->cacheKey = null;
     }