Changeset 1304

Timestamp:

03/13/10 11:18:28 (3 years ago)

Author:

nick_ramsay

Message:

[Trunk] Hotaru 1.1.2, with more to follow soon.

Location:

trunk

Files:

• . (modified) (1 prop)
• Hotaru.php (modified) (4 diffs)
• READ_ME.txt (modified) (3 diffs)
• content/plugins (modified) (1 prop)
• content/plugins/activity/css/activity.css (modified) (1 diff)
• content/plugins/categories/css/categories.css (modified) (1 diff)
• content/plugins/comments/css/comments.css (modified) (1 diff)
• content/plugins/user_manager/user_manager_settings.php (modified) (1 diff)
• content/plugins/user_rankings (copied) (copied from branches/1.2/content/plugins/user_rankings)
• content/plugins/user_rankings/css (copied) (copied from branches/1.2/content/plugins/user_rankings/css)
• content/plugins/user_rankings/css/user_rankings.css (copied) (copied from branches/1.2/content/plugins/user_rankings/css/user_rankings.css)
• content/plugins/user_rankings/images (copied) (copied from branches/1.2/content/plugins/user_rankings/images)
• content/plugins/user_rankings/javascript (copied) (copied from branches/1.2/content/plugins/user_rankings/javascript)
• content/plugins/user_rankings/languages (copied) (copied from branches/1.2/content/plugins/user_rankings/languages)
• content/plugins/user_rankings/languages/user_rankings_language.php (copied) (copied from branches/1.2/content/plugins/user_rankings/languages/user_rankings_language.php)
• content/plugins/user_rankings/readme.txt (copied) (copied from branches/1.2/content/plugins/user_rankings/readme.txt)
• content/plugins/user_rankings/templates (copied) (copied from branches/1.2/content/plugins/user_rankings/templates)
• content/plugins/user_rankings/templates/user_rankings_page.php (copied) (copied from branches/1.2/content/plugins/user_rankings/templates/user_rankings_page.php)
• content/plugins/user_rankings/user_rankings.php (copied) (copied from branches/1.2/content/plugins/user_rankings/user_rankings.php)
• content/plugins/user_rankings/user_rankings_settings.php (copied) (copied from branches/1.2/content/plugins/user_rankings/user_rankings_settings.php)
• content/themes/default/css/style.css (modified) (1 diff)
• content/themes/default/header.php (modified) (1 diff)
• install/install_tables.php (modified) (1 diff)
• install/upgrade.php (modified) (1 diff)
• libs/Caching.php (modified) (1 diff)
• libs/EmailFunctions.php (modified) (1 diff)
• libs/Maintenance.php (modified) (1 diff)
• libs/Widget.php (modified) (1 diff)
• libs/extensions/SimplePie/simplepie.inc (modified) (99 diffs)

trunk/Hotaru.php

@@ -26 +26 @@
 class Hotaru
 {
-    protected $version              = "1.1.1";  // Hotaru CMS version
+    protected $version              = "1.1.2";  // Hotaru CMS version
     protected $isDebug              = false;    // show db queries and page loading time
     protected $isAdmin              = false;    // flag to tell if we are in Admin or not
@@ -131 +131 @@
                 $this->displayTemplate('index');        // displays the index page
         }
-
-        if ($this->isDebug) {
-            $this->closeLog('error');
-        }
         
         exit;
@@ -1324 +1320 @@
         require_once(LIBS . 'Maintenance.php');
         $maintenance = new Maintenance();
-        return $maintenance->siteClosed($this->lang); // displays "Site Closed for Maintenance"
+        return $maintenance->siteClosed($this, $this->lang); // displays "Site Closed for Maintenance"
     }
     
@@ -1481 +1477 @@
     
     
+    /**
+     * Cache HTML without checking for database updates
+     *
+     * This function caches blocks of HTML code
+     *
+     * @param int $timeout timeout in minutes before cache file is deleted
+     * @param string $html block of HTML to cache
+     * @param string $label name to identify the cached file
+     * @return bool
+     */
+    public function cacheHTML($timeout = 0, $html = '', $label = '')
+    {
+        require_once(LIBS . 'Caching.php');
+        $caching = new Caching();
+        return $caching->cacheHTML($this, $timeout, $html, $label);
+    }
+    
+    
  /* *************************************************************
  *

trunk/READ_ME.txt

@@ -1 +1 @@
 HOTARU CMS
-Version: 1.1.1
-Released: Feb 24th 2010
+Version: 1.1.2
+Released: Mar 8th 2010
 
 INSTALLATION
@@ -8 +8 @@
 Please visit http://hotarucms.org/showthread.php?t=14 for the most up-to-date version of these instructions.
 
-Instructions last updated: January 18th 2010
+Instructions last updated: Mar 8th 2010
 
 Requirements
@@ -18 +18 @@
    1. Backup your database.
    2. Download the latest version of Hotaru CMS.
-   3. Overwrite ALL the old files. If you've made any customizations, read this first: http://hotarucms.org/showthread.php?t=46
-   4. Go to /install/upgrade.php
-   5. When finished, delete the install folder.
+   3. Turn off all your plugins.
+   4. Overwrite ALL the old files. If you've made any customizations, read this first: http://hotarucms.org/showthread.php?t=46
+   5. Go to /install/upgrade.php
+   6. Turn your plugins back on
+   7. Reactivate your widgets
+   8. When finished, delete the install folder.
 
 First-time Installation

trunk/content/plugins/activity/css/activity.css

@@ -1 @@
-/* **************************************
- *        ACTIVITY PLUGIN CSS       *
- ************************************** */
+/* activity */
 
 /* WIDGET */

trunk/content/plugins/categories/css/categories.css

@@ -1 @@
-/* **************************************
- *      CATEGORIES PLUGIN CSS           *
- ************************************** */
+/* categories */
 
 /* DROP-DOWN CATEGORY MENU BAR */

trunk/content/plugins/comments/css/comments.css

@@ -1 @@
-/* **************************************
- *       COMMENTS PLUGIN CSS            *
- ************************************** */
+/* comments */
 
 .comment_link       { padding-left: 1.5em; background-image: url(content/plugins/comments/images/comment.png); background-repeat: no-repeat; }

trunk/content/plugins/user_manager/user_manager_settings.php

@@ -97 +97 @@
                         }
                         $h->pluginHook('user_man_killspam_delete', '', array($u));
-                        if ($new_role == 'deleted') { $u->deleteUser($h); }
+                        if ($new_role == 'deleted') { 
+                            $u->deleteUser($h); 
+                            $h->clearCache('db_cache', false); // clears them from User Manager list
+                        }
                     }
                 }

trunk/content/themes/default/css/style.css

@@ -85 +85 @@
 #site_closed { background-color: #fff; border-top: 2px solid #000; border-bottom: 2px solid #000; 
                 text-align: center; margin-top: 4em; font-size: 1.6em; line-height: 1.8em; }
+                
+#site_closed_admin_link { font-size: 8pt; margin-top: 1.0em; }
 
 /* BREADCRUMBS */

trunk/content/themes/default/header.php

@@ -44 +44 @@
         <?php } ?>
    
-    <script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.4.0/jquery.min.js?ver=1.4.0'></script>
+    <script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js?ver=1.4.2'></script>
     <script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js?ver=1.7.2'></script>
        

trunk/install/install_tables.php

@@ -342 +342 @@
         // Site email
         $sql = "INSERT INTO " . DB_PREFIX . $table_name . " (settings_name, settings_value, settings_default, settings_note) VALUES (%s, %s, %s, %s)";
-        $db->query($db->prepare($sql, 'SITE_EMAIL', 'admin@mysite.com', 'admin@mysite.com', 'Must be changed'));
+        $db->query($db->prepare($sql, 'SITE_EMAIL', 'email@example.com', 'email@example.com', 'Must be changed'));
         
         // Database cache

trunk/install/upgrade.php

@@ -345 +345 @@
     if ($old_version == "1.1") { $old_version = "1.1.1"; } // update "old version" for next set of upgrades
     
+    // 1.1 to 1.1.2
+    if ($old_version == "1.1.1") { $old_version = "1.1.2"; } // update "old version" for next set of upgrades
+    
     // Update Hotaru version number to the database (referred to when upgrading)
     $sql = "UPDATE " . TABLE_MISCDATA . " SET miscdata_key = %s, miscdata_value = %s, miscdata_default = %s WHERE miscdata_key = %s";

trunk/libs/Caching.php

@@ -245 +245 @@
         return $last_update;
     }
+    
+    
+    /**
+     * Cache HTML without checking for database updates
+     *
+     * This function caches blocks of HTML code
+     *
+     * @param int $timeout timeout in minutes before cache file is deleted
+     * @param string $html block of HTML to cache
+     * @param string $label name to identify the cached file
+     * @return bool
+     */
+    public function cacheHTML($h, $timeout = 0, $html = '', $label = '')
+    {
+        if (!$timeout || (HTML_CACHE_ON != 'true') || !$label) { return false; }
+        
+        $cache_length = $timeout*60;   // seconds
+        $cache = CACHE . 'html_cache/';
+        $file = $cache . $label . ".cache";
+        
+        if (!$html) {
+            // we only want to read the cache if it exists, hence no $html passed to this function
+            if (file_exists($file)) {
+                $content = file_get_contents($file);
+                $last_modified = filemtime($file);
+                //echo "last modified: " . $last_modified . "<br />";
+                if ($last_modified <= (time() - $cache_length)) { 
+                    // delete cache
+                    unlink($file);
+                    return false;
+                } else {
+                    return $content;    // return the HTML to display
+                }
+            } else {
+                return false;
+            }
+        }
+        
+        // if we're here, we need to make or rewrite the cache
+        
+        $fp = fopen($file, "w");
+
+        if (flock($fp, LOCK_EX)) { // do an exclusive lock
+            ftruncate($fp, 0);  // truncate file
+            fwrite($fp, $html); // write HTML
+            flock($fp, LOCK_UN); // release the lock
+        } else {
+            echo "Couldn't get the lock for the HTML cache!";
+        }
+        
+        fclose($fp);
+        return true; // the calling function already has the HTML to output
+    }
 }
 ?>

trunk/libs/EmailFunctions.php

@@ -113 +113 @@
                 break;
             default:
-                mail($this->to, $this->subject, $this->body, $this->headers);
+                $return_path = "-f " . SITE_EMAIL;
+                mail($this->to, $this->subject, $this->body, $this->headers, $return_path);
         }
     }

trunk/libs/Maintenance.php

@@ -193 +193 @@
      * @param object $h
      */
-    public function siteClosed($lang)
-    {
-        // site closed and access not granted, so exit with a message:
+    public function siteClosed($h, $lang)
+    {
+        // site closed and access not granted
         echo "<HTML>\n<HEAD>\n";
         echo "<link rel='stylesheet' href='" . BASEURL . "content/themes/" . THEME . "css/style.css' type='text/css'>\n";
         echo "</HEAD>\n<BODY>\n";
         echo "<div id='site_closed'>\n";
-        echo $lang['main_hotaru_site_closed'];
-        echo "<br /><span style='font-size: 8pt; margin-top: 1.0em;'>[<a href='" . BASEURL . "admin_index.php?page=admin_login'>Admin Login</a>]</span>";
+        
+        // show custom maintenance page if one exists:
+        if (file_exists(THEMES . THEME . 'closed.php'))
+        {
+            $h->displayTemplate('closed');
+        } 
+        else
+        {
+            // show default maintenance page:
+            echo $lang['main_hotaru_site_closed'];
+            echo "<br /><span id='site_closed_admin_link'>[<a href='" . BASEURL . "admin_index.php?page=admin_login'>Admin Login</a>]</span>";
+        }
+        
         echo "\n</div>\n</BODY>\n</HTML>\n";
+        
         die(); exit;
     }

trunk/libs/Widget.php

@@ -41 +41 @@
                     if (!$h->isInstalled($plugin['plugin'])) {
                         $this->deleteWidget($h, $plugin['function']);
-                        unset($widgets_settings['widgets'][$plugin['plugin']]);
+                        unset($widgets_settings['widgets'][$plugin['function']]);
                         // widget settings get updated at the end of this function
                     }

trunk/libs/extensions/SimplePie/simplepie.inc

@@ -736 +736 @@
         {
                 // Other objects, instances created here so we can set options on them
-                $this->sanitize =& new SimplePie_Sanitize;
+                $this->sanitize = new SimplePie_Sanitize;
 
                 // Set options if they're passed to the constructor
@@ -1106 +1106 @@
                 if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Sanitize'))
                 {
-                        $this->sanitize =& new $class;
+                        $this->sanitize = new $class;
                         return true;
                 }
@@ -1600 +1600 @@
                                                                         $headers['if-none-match'] = '"' . $this->data['headers']['etag'] . '"';
                                                                 }
-                                                                $file =& new $this->file_class($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen);
+                                                                $file = new $this->file_class($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen);
                                                                 if ($file->success)
                                                                 {
@@ -1641 +1641 @@
                                         else
                                         {
-                                                $file =& new $this->file_class($this->feed_url, $this->timeout, 5, null, $this->useragent, $this->force_fsockopen);
+                                                $file = new $this->file_class($this->feed_url, $this->timeout, 5, null, $this->useragent, $this->force_fsockopen);
                                         }
                                 }
@@ -1661 +1661 @@
                                 {
                                         // Check if the supplied URL is a feed, if it isn't, look for it.
-                                        $locate =& new $this->locator_class($file, $this->timeout, $this->useragent, $this->file_class, $this->max_checked_feeds, $this->content_type_sniffer_class);
+                                        $locate = new $this->locator_class($file, $this->timeout, $this->useragent, $this->file_class, $this->max_checked_feeds, $this->content_type_sniffer_class);
                                         if (!$locate->is_feed($file))
                                         {
@@ -1691 +1691 @@
                                 $headers = $file->headers;
                                 $data = $file->body;
-                                $sniffer =& new $this->content_type_sniffer_class($file);
+                                $sniffer = new $this->content_type_sniffer_class($file);
                                 $sniffed = $sniffer->get_type();
                         }
@@ -1761 +1761 @@
                                 {
                                         // Create new parser
-                                        $parser =& new $this->parser_class();
+                                        $parser = new $this->parser_class();
 
                                         // If it's parsed fine
@@ -1972 +1972 @@
                                 else
                                 {
-                                        $file =& new $this->file_class($favicon, $this->timeout / 10, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen);
+                                        $file = new $this->file_class($favicon, $this->timeout / 10, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen);
 
                                         if ($file->success && ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)) && strlen($file->body) > 0)
                                         {
-                                                $sniffer =& new $this->content_type_sniffer_class($file);
+                                                $sniffer = new $this->content_type_sniffer_class($file);
                                                 if (substr($sniffer->get_type(), 0, 6) === 'image/')
                                                 {
@@ -2375 +2375 @@
                                 $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
                         }
-                        $categories[] =& new $this->category_class($term, $scheme, $label);
+                        $categories[] = new $this->category_class($term, $scheme, $label);
                 }
                 foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category)
@@ -2390 +2390 @@
                                 $scheme = null;
                         }
-                        $categories[] =& new $this->category_class($term, $scheme, null);
+                        $categories[] = new $this->category_class($term, $scheme, null);
                 }
                 foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
                 {
-                        $categories[] =& new $this->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+                        $categories[] = new $this->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
                 }
                 foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category)
                 {
-                        $categories[] =& new $this->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+                        $categories[] = new $this->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
                 }
 
@@ -2446 +2446 @@
                         if ($name !== null || $email !== null || $uri !== null)
                         {
-                                $authors[] =& new $this->author_class($name, $uri, $email);
+                                $authors[] = new $this->author_class($name, $uri, $email);
                         }
                 }
@@ -2468 +2468 @@
                         if ($name !== null || $email !== null || $url !== null)
                         {
-                                $authors[] =& new $this->author_class($name, $url, $email);
+                                $authors[] = new $this->author_class($name, $url, $email);
                         }
                 }
                 foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author)
                 {
-                        $authors[] =& new $this->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+                        $authors[] = new $this->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
                 }
                 foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author)
                 {
-                        $authors[] =& new $this->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+                        $authors[] = new $this->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
                 }
                 foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author)
                 {
-                        $authors[] =& new $this->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+                        $authors[] = new $this->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
                 }
 
@@ -2529 +2529 @@
                         if ($name !== null || $email !== null || $uri !== null)
                         {
-                                $contributors[] =& new $this->author_class($name, $uri, $email);
+                                $contributors[] = new $this->author_class($name, $uri, $email);
                         }
                 }
@@ -2551 +2551 @@
                         if ($name !== null || $email !== null || $url !== null)
                         {
-                                $contributors[] =& new $this->author_class($name, $url, $email);
+                                $contributors[] = new $this->author_class($name, $url, $email);
                         }
                 }
@@ -2964 +2964 @@
                                         foreach ($keys as $key)
                                         {
-                                                $this->data['items'][] =& new $this->item_class($this, $items[$key]);
+                                                $this->data['items'][] = new $this->item_class($this, $items[$key]);
                                         }
                                 }
@@ -2972 +2972 @@
                                         foreach ($keys as $key)
                                         {
-                                                $this->data['items'][] =& new $this->item_class($this, $items[$key]);
+                                                $this->data['items'][] = new $this->item_class($this, $items[$key]);
                                         }
                                 }
@@ -2980 +2980 @@
                                         foreach ($keys as $key)
                                         {
-                                                $this->data['items'][] =& new $this->item_class($this, $items[$key]);
+                                                $this->data['items'][] = new $this->item_class($this, $items[$key]);
                                         }
                                 }
@@ -2988 +2988 @@
                                         foreach ($keys as $key)
                                         {
-                                                $this->data['items'][] =& new $this->item_class($this, $items[$key]);
+                                                $this->data['items'][] = new $this->item_class($this, $items[$key]);
                                         }
                                 }
@@ -2996 +2996 @@
                                         foreach ($keys as $key)
                                         {
-                                                $this->data['items'][] =& new $this->item_class($this, $items[$key]);
+                                                $this->data['items'][] = new $this->item_class($this, $items[$key]);
                                         }
                                 }
@@ -3347 +3347 @@
                                 $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
                         }
-                        $categories[] =& new $this->feed->category_class($term, $scheme, $label);
+                        $categories[] = new $this->feed->category_class($term, $scheme, $label);
                 }
                 foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category)
@@ -3362 +3362 @@
                                 $scheme = null;
                         }
-                        $categories[] =& new $this->feed->category_class($term, $scheme, null);
+                        $categories[] = new $this->feed->category_class($term, $scheme, null);
                 }
                 foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
                 {
-                        $categories[] =& new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+                        $categories[] = new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
                 }
                 foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category)
                 {
-                        $categories[] =& new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+                        $categories[] = new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
                 }
 
@@ -3431 +3431 @@
                         if ($name !== null || $email !== null || $uri !== null)
                         {
-                                $contributors[] =& new $this->feed->author_class($name, $uri, $email);
+                                $contributors[] = new $this->feed->author_class($name, $uri, $email);
                         }
                 }
@@ -3453 +3453 @@
                         if ($name !== null || $email !== null || $url !== null)
                         {
-                                $contributors[] =& new $this->feed->author_class($name, $url, $email);
+                                $contributors[] = new $this->feed->author_class($name, $url, $email);
                         }
                 }
@@ -3489 +3489 @@
                         if ($name !== null || $email !== null || $uri !== null)
                         {
-                                $authors[] =& new $this->feed->author_class($name, $uri, $email);
+                                $authors[] = new $this->feed->author_class($name, $uri, $email);
                         }
                 }
@@ -3511 +3511 @@
                         if ($name !== null || $email !== null || $url !== null)
                         {
-                                $authors[] =& new $this->feed->author_class($name, $url, $email);
+                                $authors[] = new $this->feed->author_class($name, $url, $email);
                         }
                 }
                 if ($author = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'author'))
                 {
-                        $authors[] =& new $this->feed->author_class(null, null, $this->sanitize($author[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+                        $authors[] = new $this->feed->author_class(null, null, $this->sanitize($author[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
                 }
                 foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author)
                 {
-                        $authors[] =& new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+                        $authors[] = new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
                 }
                 foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author)
                 {
-                        $authors[] =& new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+                        $authors[] = new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
                 }
                 foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author)
                 {
-                        $authors[] =& new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+                        $authors[] = new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
                 }
 
@@ -3838 +3838 @@
                                                 $caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                         }
-                                        $captions_parent[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
+                                        $captions_parent[] = new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
                                 }
                         }
@@ -3870 +3870 @@
                                                 $caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                         }
-                                        $captions_parent[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
+                                        $captions_parent[] = new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
                                 }
                         }
@@ -3900 +3900 @@
                                         $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
                                 }
-                                $categories_parent[] =& new $this->feed->category_class($term, $scheme, $label);
+                                $categories_parent[] = new $this->feed->category_class($term, $scheme, $label);
                         }
                         foreach ((array) $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'category') as $category)
@@ -3923 +3923 @@
                                         $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
                                 }
-                                $categories_parent[] =& new $this->feed->category_class($term, $scheme, $label);
+                                $categories_parent[] = new $this->feed->category_class($term, $scheme, $label);
                         }
                         foreach ((array) $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'category') as $category)
@@ -3934 +3934 @@
                                         $label = $this->sanitize($category['attribs']['']['text'], SIMPLEPIE_CONSTRUCT_TEXT);
                                 }
-                                $categories_parent[] =& new $this->feed->category_class($term, $scheme, $label);
+                                $categories_parent[] = new $this->feed->category_class($term, $scheme, $label);
 
                                 if (isset($category['child'][SIMPLEPIE_NAMESPACE_ITUNES]['category']))
@@ -3944 +3944 @@
                                                         $label = $this->sanitize($subcategory['attribs']['']['text'], SIMPLEPIE_CONSTRUCT_TEXT);
                                                 }
-                                                $categories_parent[] =& new $this->feed->category_class($term, $scheme, $label);
+                                                $categories_parent[] = new $this->feed->category_class($term, $scheme, $label);
                                         }
                                 }
@@ -3966 +3966 @@
                                         $copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                 }
-                                $copyrights_parent =& new $this->feed->copyright_class($copyright_url, $copyright_label);
+                                $copyrights_parent = new $this->feed->copyright_class($copyright_url, $copyright_label);
                         }
                         elseif ($copyright = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
@@ -3980 +3980 @@
                                         $copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                 }
-                                $copyrights_parent =& new $this->feed->copyright_class($copyright_url, $copyright_label);
+                                $copyrights_parent = new $this->feed->copyright_class($copyright_url, $copyright_label);
                         }
 
@@ -4007 +4007 @@
                                                 $credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                         }
-                                        $credits_parent[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
+                                        $credits_parent[] = new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
                                 }
                         }
@@ -4033 +4033 @@
                                                 $credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                         }
-                                        $credits_parent[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
+                                        $credits_parent[] = new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
                                 }
                         }
@@ -4222 +4222 @@
                                                 $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                         }
-                                        $ratings_parent[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
+                                        $ratings_parent[] = new $this->feed->rating_class($rating_scheme, $rating_value);
                                 }
                         }
@@ -4235 +4235 @@
                                                 $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                         }
-                                        $ratings_parent[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
+                                        $ratings_parent[] = new $this->feed->rating_class($rating_scheme, $rating_value);
                                 }
                         }
@@ -4256 +4256 @@
                                                 $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                         }
-                                        $ratings_parent[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
+                                        $ratings_parent[] = new $this->feed->rating_class($rating_scheme, $rating_value);
                                 }
                         }
@@ -4269 +4269 @@
                                                 $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                         }
-                                        $ratings_parent[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
+                                        $ratings_parent[] = new $this->feed->rating_class($rating_scheme, $rating_value);
                                 }
                         }
@@ -4297 +4297 @@
                                                 $restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                         }
-                                        $restrictions_parent[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
+                                        $restrictions_parent[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
                                 }
                         }
@@ -4311 +4311 @@
                                                 $restriction_relationship = 'deny';
                                         }
-                                        $restrictions_parent[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
+                                        $restrictions_parent[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
                                 }
                         }
@@ -4333 +4333 @@
                                                 $restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                         }
-                                        $restrictions_parent[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
+                                        $restrictions_parent[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
                                 }
                         }
@@ -4347 +4347 @@
                                                 $restriction_relationship = 'deny';
                                         }
-                                        $restrictions_parent[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
+                                        $restrictions_parent[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
                                 }
                         }
@@ -4551 +4551 @@
                                                                         $caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                                                 }
-                                                                $captions[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
+                                                                $captions[] = new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
                                                         }
                                                         if (is_array($captions))
@@ -4587 +4587 @@
                                                                         $caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                                                 }
-                                                                $captions[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
+                                                                $captions[] = new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
                                                         }
                                                         if (is_array($captions))
@@ -4623 +4623 @@
                                                                         $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
                                                                 }
-                                                                $categories[] =& new $this->feed->category_class($term, $scheme, $label);
+                                                                $categories[] = new $this->feed->category_class($term, $scheme, $label);
                                                         }
                                                 }
@@ -4649 +4649 @@
                                                                         $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
                                                                 }
-                                                                $categories[] =& new $this->feed->category_class($term, $scheme, $label);
+                                                                $categories[] = new $this->feed->category_class($term, $scheme, $label);
                                                         }
                                                 }
@@ -4678 +4678 @@
                                                                 $copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                                         }
-                                                        $copyrights =& new $this->feed->copyright_class($copyright_url, $copyright_label);
+                                                        $copyrights = new $this->feed->copyright_class($copyright_url, $copyright_label);
                                                 }
                                                 elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
@@ -4692 +4692 @@
                                                                 $copyright_label = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                                         }
-                                                        $copyrights =& new $this->feed->copyright_class($copyright_url, $copyright_label);
+                                                        $copyrights = new $this->feed->copyright_class($copyright_url, $copyright_label);
                                                 }
                                                 else
@@ -4723 +4723 @@
                                                                         $credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                                                 }
-                                                                $credits[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
+                                                                $credits[] = new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
                                                         }
                                                         if (is_array($credits))
@@ -4753 +4753 @@
                                                                         $credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                                                 }
-                                                                $credits[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
+                                                                $credits[] = new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
                                                         }
                                                         if (is_array($credits))
@@ -4906 +4906 @@
                                                                         $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                                                 }
-                                                                $ratings[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
+                                                                $ratings[] = new $this->feed->rating_class($rating_scheme, $rating_value);
                                                         }
                                                         if (is_array($ratings))
@@ -4931 +4931 @@
                                                                         $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                                                 }
-                                                                $ratings[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
+                                                                $ratings[] = new $this->feed->rating_class($rating_scheme, $rating_value);
                                                         }
                                                         if (is_array($ratings))
@@ -4963 +4963 @@
                                                                         $restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                                                 }
-                                                                $restrictions[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
+                                                                $restrictions[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
                                                         }
                                                         if (is_array($restrictions))
@@ -4989 +4989 @@
                                                                         $restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                                                 }
-                                                                $restrictions[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
+                                                                $restrictions[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
                                                         }
                                                         if (is_array($restrictions))
@@ -5043 +5043 @@
                                                 }
 
-                                                $this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width);
+                                                $this->data['enclosures'][] = new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width);
                                         }
                                 }
@@ -5172 +5172 @@
                                                                         $caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                                                 }
-                                                                $captions[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
+                                                                $captions[] = new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
                                                         }
                                                         if (is_array($captions))
@@ -5208 +5208 @@
                                                                         $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
                                                                 }
-                                                                $categories[] =& new $this->feed->category_class($term, $scheme, $label);
+                                                                $categories[] = new $this->feed->category_class($term, $scheme, $label);
                                                         }
                                                 }
@@ -5241 +5241 @@
                                                                 $copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                                         }
-                                                        $copyrights =& new $this->feed->copyright_class($copyright_url, $copyright_label);
+                                                        $copyrights = new $this->feed->copyright_class($copyright_url, $copyright_label);
                                                 }
                                                 else
@@ -5272 +5272 @@
                                                                         $credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                                                 }
-                                                                $credits[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
+                                                                $credits[] = new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
                                                         }
                                                         if (is_array($credits))
@@ -5376 +5376 @@
                                                                         $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                                                 }
-                                                                $ratings[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
+                                                                $ratings[] = new $this->feed->rating_class($rating_scheme, $rating_value);
                                                         }
                                                         if (is_array($ratings))
@@ -5408 +5408 @@
                                                                         $restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                                                 }
-                                                                $restrictions[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
+                                                                $restrictions[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
                                                         }
                                                         if (is_array($restrictions))
@@ -5447 +5447 @@
                                                 }
 
-                                                $this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width);
+                                                $this->data['enclosures'][] = new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width);
                                         }
                                 }
@@ -5483 +5483 @@
 
                                         // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
-                                        $this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width);
+                                        $this->data['enclosures'][] = new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width);
                                 }
                         }
@@ -5518 +5518 @@
 
                                         // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
-                                        $this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width);
+                                        $this->data['enclosures'][] = new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width);
                                 }
                         }
@@ -5553 +5553 @@
 
                                         // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
-                                        $this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width);
+                                        $this->data['enclosures'][] = new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width);
                                 }
                         }
@@ -5560 +5560 @@
                         {
                                 // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
-                                $this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width);
+                                $this->data['enclosures'][] = new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width);
                         }
 
@@ -5837 +5837 @@
                                 $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
                         }
-                        $categories[] =& new $this->item->feed->category_class($term, $scheme, $label);
+                        $categories[] = new $this->item->feed->category_class($term, $scheme, $label);
                 }
                 foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category)
@@ -5852 +5852 @@
                                 $scheme = null;
                         }
-                        $categories[] =& new $this->item->feed->category_class($term, $scheme, null);
+                        $categories[] = new $this->item->feed->category_class($term, $scheme, null);
                 }
                 foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
                 {
-                        $categories[] =& new $this->item->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+                        $categories[] = new $this->item->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
                 }
                 foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category)
                 {
-                        $categories[] =& new $this->item->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+                        $categories[] = new $this->item->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
                 }
 
@@ -5908 +5908 @@
                         if ($name !== null || $email !== null || $uri !== null)
                         {
-                                $authors[] =& new $this->item->feed->author_class($name, $uri, $email);
+                                $authors[] = new $this->item->feed->author_class($name, $uri, $email);
                         }
                 }
@@ -5930 +5930 @@
                         if ($name !== null || $email !== null || $url !== null)
                         {
-                                $authors[] =& new $this->item->feed->author_class($name, $url, $email);
+                                $authors[] = new $this->item->feed->author_class($name, $url, $email);
                         }
                 }
                 foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author)
                 {
-                        $authors[] =& new $this->item->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+                        $authors[] = new $this->item->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
                 }
                 foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author)
                 {
-                        $authors[] =& new $this->item->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+                        $authors[] = new $this->item->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
                 }
                 foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author)
                 {
-                        $authors[] =& new $this->item->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+                        $authors[] = new $this->item->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
                 }
 
@@ -5991 +5991 @@
                         if ($name !== null || $email !== null || $uri !== null)
                         {
-                                $contributors[] =& new $this->item->feed->author_class($name, $uri, $email);
+                                $contributors[] = new $this->item->feed->author_class($name, $uri, $email);
                         }
                 }
@@ -6013 +6013 @@
                         if ($name !== null || $email !== null || $url !== null)
                         {
-                                $contributors[] =& new $this->item->feed->author_class($name, $url, $email);
+                                $contributors[] = new $this->item->feed->author_class($name, $url, $email);
                         }
                 }
@@ -6450 +6450 @@
                 if (class_exists('idna_convert'))
                 {
-                        $idn =& new idna_convert;
+                        $idn = new idna_convert;
                         $parsed = SimplePie_Misc::parse_url($link);
                         $this->link = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']);
@@ -7648 +7648 @@
                 if (class_exists('idna_convert'))
                 {
-                        $idn =& new idna_convert;
+                        $idn = new idna_convert;
                         $parsed = SimplePie_Misc::parse_url($url);
                         $url = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']);
@@ -7709 +7709 @@
                                         $this->headers = explode("\r\n\r\n", $this->headers, $info['redirect_count'] + 1);
                                         $this->headers = array_pop($this->headers);
-                                        $parser =& new SimplePie_HTTP_Parser($this->headers);
+                                        $parser = new SimplePie_HTTP_Parser($this->headers);
                                         if ($parser->parse())
                                         {
@@ -7790 +7790 @@
                                         if (!$info['timed_out'])
                                         {
-                                                $parser =& new SimplePie_HTTP_Parser($this->headers);
+                                                $parser = new SimplePie_HTTP_Parser($this->headers);
                                                 if ($parser->parse())
                                                 {
@@ -7809 +7809 @@
                                                                         case 'gzip':
                                                                         case 'x-gzip':
-                                                                                $decoder =& new SimplePie_gzdecode($this->body);
+                                                                                $decoder = new SimplePie_gzdecode($this->body);
                                                                                 if (!$decoder->parse())
                                                                                 {
@@ -8621 +8621 @@
         function create($location, $filename, $extension)
         {
-                $location_iri =& new SimplePie_IRI($location);
+                $location_iri = new SimplePie_IRI($location);
                 switch ($location_iri->get_scheme())
                 {
@@ -9318 +9318 @@
         function parse_url($url)
         {
-                $iri =& new SimplePie_IRI($url);
+                $iri = new SimplePie_IRI($url);
                 return array(
                         'scheme' => (string) $iri->get_scheme(),
@@ -9330 +9330 @@
         function compress_parse_url($scheme = '', $authority = '', $path = '', $query = '', $fragment = '')
         {
-                $iri =& new SimplePie_IRI('');
+                $iri = new SimplePie_IRI('');
                 $iri->set_scheme($scheme);
                 $iri->set_authority($authority);
@@ -9341 +9341 @@
         function normalize_url($url)
         {
-                $iri =& new SimplePie_IRI($url);
+                $iri = new SimplePie_IRI($url);
                 return $iri->get_iri();
         }
@@ -10861 +10861 @@
         function entities_decode($data)
         {
-                $decoder =& new SimplePie_Decode_HTML_Entities($data);
+                $decoder = new SimplePie_Decode_HTML_Entities($data);
                 return $decoder->parse();
         }
@@ -11257 +11257 @@
                         if ($pos = strpos($data, "\x00\x00\x00\x3F\x00\x00\x00\x3E"))
                         {
-                                $parser =& new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32BE', 'UTF-8'));
+                                $parser = new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32BE', 'UTF-8'));
                                 if ($parser->parse())
                                 {
@@ -11270 +11270 @@
                         if ($pos = strpos($data, "\x3F\x00\x00\x00\x3E\x00\x00\x00"))
                         {
-                                $parser =& new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32LE', 'UTF-8'));
+                                $parser = new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32LE', 'UTF-8'));
                                 if ($parser->parse())
                                 {
@@ -11283 +11283 @@
                         if ($pos = strpos($data, "\x00\x3F\x00\x3E"))
                         {
-                                $parser =& new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16BE', 'UTF-8'));
+                                $parser = new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16BE', 'UTF-8'));
                                 if ($parser->parse())
                                 {
@@ -11296 +11296 @@
                         if ($pos = strpos($data, "\x3F\x00\x3E\x00"))
                         {
-                                $parser =& new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16LE', 'UTF-8'));
+                                $parser = new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16LE', 'UTF-8'));
                                 if ($parser->parse())
                                 {
@@ -11309 +11309 @@
                         if ($pos = strpos($data, "\x3F\x3E"))
                         {
-                                $parser =& new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5));
+                                $parser = new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5));
                                 if ($parser->parse())
                                 {
@@ -11684 +11684 @@
                 if ($relative !== '')
                 {
-                        $relative =& new SimplePie_IRI($relative);
+                        $relative = new SimplePie_IRI($relative);
                         if ($relative->get_scheme() !== null)
                         {
@@ -11698 +11698 @@
                                 else
                                 {
-                                        $target =& new SimplePie_IRI('');
+                                        $target = new SimplePie_IRI('');
                                         $target->set_scheme($base->get_scheme());
                                         $target->set_userinfo($base->get_userinfo());
@@ -13050 +13050 @@
                 if (!$object)
                 {
-                        $object =& new SimplePie_Parse_Date;
+                        $object = new SimplePie_Parse_Date;
                 }
                 return $object;
@@ -14085 +14085 @@
                 if ($this->file->method & SIMPLEPIE_FILE_SOURCE_REMOTE)
                 {
-                        $sniffer =& new $this->content_type_sniffer_class($this->file);
+                        $sniffer = new $this->content_type_sniffer_class($this->file);
                         if ($sniffer->get_type() !== 'text/html')
                         {
@@ -14131 +14131 @@
                 if ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE)
                 {
-                        $sniffer =& new $this->content_type_sniffer_class($file);
+                        $sniffer = new $this->content_type_sniffer_class($file);
                         $sniffed = $sniffer->get_type();
                         if (in_array($sniffed, array('application/rss+xml', 'application/rdf+xml', 'text/rdf', 'application/atom+xml', 'text/xml', 'application/xml')))
@@ -14195 +14195 @@
                                 {
                                         $this->checked_feeds++;
-                                        $feed =& new $this->file_class($href, $this->timeout, 5, null, $this->useragent);
+                                        $feed = new $this->file_class($href, $this->timeout, 5, null, $this->useragent);
                                         if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
                                         {
@@ -14267 +14267 @@
                         {
                                 $this->checked_feeds++;
-                                $feed =& new $this->file_class($value, $this->timeout, 5, null, $this->useragent);
+                                $feed = new $this->file_class($value, $this->timeout, 5, null, $this->useragent);
                                 if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
                                 {
@@ -14292 +14292 @@
                         {
                                 $this->checked_feeds++;
-                                $feed =& new $this->file_class($value, $this->timeout, 5, null, $this->useragent);
+                                $feed = new $this->file_class($value, $this->timeout, 5, null, $this->useragent);
                                 if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
                                 {
@@ -14366 +14366 @@
                 if (substr($data, 0, 5) === '<?xml' && strspn(substr($data, 5, 1), "\x09\x0A\x0D\x20") && ($pos = strpos($data, '?>')) !== false)
                 {
-                        $declaration =& new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5));
+                        $declaration = new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5));
                         if ($declaration->parse())
                         {
@@ -14416 +14416 @@
                 {
                         libxml_clear_errors();
-                        $xml =& new XMLReader();
+                        $xml = new XMLReader();
                         $xml->xml($data);
                         while (@$xml->read())
@@ -14902 +14902 @@
                                                         else
                                                         {
-                                                                $file =& new $this->file_class($img['attribs']['src']['data'], $this->timeout, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen);
+                                                                $file = new $this->file_class($img['attribs']['src']['data'], $this->timeout, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen);
                                                                 $headers = $file->headers;