Browse Source

compat patches for php7

Andrew Dolgov 8 years ago
parent
commit
1bd552ee31
3 changed files with 7 additions and 7 deletions
  1. 1 1
      classes/feeds.php
  2. 2 2
      classes/pref/feeds.php
  3. 4 4
      lib/phpmailer/class.phpmailer.php

+ 1 - 1
classes/feeds.php

@@ -935,7 +935,7 @@ class Feeds extends Handler_Protected {
 		//$reply['headlines']['content'] =& $ret[5]['content'];
 		//$reply['headlines']['toolbar'] =& $ret[5]['toolbar'];
 
-		$reply['headlines'] =& $ret[5];
+		$reply['headlines'] = $ret[5];
 
 		if (!$next_unread_feed)
 			$reply['headlines']['id'] = $feed;

+ 2 - 2
classes/pref/feeds.php

@@ -297,7 +297,7 @@ class Pref_Feeds extends Handler_Protected {
 		if ($_REQUEST['mode'] != 2) {
 			$fl['items'] = array($root);
 		} else {
-			$fl['items'] =& $root['items'];
+			$fl['items'] = $root['items'];
 		}
 
 		return $fl;
@@ -410,7 +410,7 @@ class Pref_Feeds extends Handler_Protected {
 						if (isset($item['items']['_reference'])) {
 							$data_map[$item['id']] = array($item['items']);
 						} else {
-							$data_map[$item['id']] =& $item['items'];
+							$data_map[$item['id']] = $item['items'];
 						}
 					}
 				if ($item['id'] == 'root') {

+ 4 - 4
lib/phpmailer/class.phpmailer.php

@@ -1853,23 +1853,23 @@ class PHPMailer {
       //      return false;
       //    }
       //  }
-      $magic_quotes = get_magic_quotes_runtime();
+      /*$magic_quotes = get_magic_quotes_runtime();
       if ($magic_quotes) {
         if (version_compare(PHP_VERSION, '5.3.0', '<')) {
           set_magic_quotes_runtime(0);
         } else {
           ini_set('magic_quotes_runtime', 0); 
         }
-      }
+      }*/
       $file_buffer  = file_get_contents($path);
       $file_buffer  = $this->EncodeString($file_buffer, $encoding);
-      if ($magic_quotes) {
+      /*if ($magic_quotes) {
         if (version_compare(PHP_VERSION, '5.3.0', '<')) {
           set_magic_quotes_runtime($magic_quotes);
         } else {
           ini_set('magic_quotes_runtime', $magic_quotes); 
         }
-      }
+      }*/
       return $file_buffer;
     } catch (Exception $e) {
       $this->SetError($e->getMessage());