cdb587a2 by Marty Penner

Merge branch 'refs/heads/notices-warnings' into v0.5

* refs/heads/notices-warnings:
  Remove some notices/warnings. refs #1650
  Fix line endings in a few files

Conflicts:
	com/ExcelWriter/PHPExcel/CachedObjectStorage/APC.php
	com/ExcelWriter/PHPExcel/CachedObjectStorage/DiscISAM.php
	com/ExcelWriter/PHPExcel/CachedObjectStorage/Memcache.php
	com/ExcelWriter/PHPExcel/CachedObjectStorage/MemoryGZip.php
	com/ExcelWriter/PHPExcel/CachedObjectStorage/MemorySerialized.php
	com/ExcelWriter/PHPExcel/CachedObjectStorage/PHPTemp.php
	com/ExcelWriter/PHPExcel/CachedObjectStorage/Wincache.php
	com/ExcelWriter/PHPExcel/Reader/Excel2007.php
	com/ExcelWriter/PHPExcel/Reader/Excel5.php
	com/ExcelWriter/PHPExcel/Shared/PCLZip/gnu-lgpl.txt
	com/ExcelWriter/PHPExcel/Shared/PCLZip/pclzip.lib.php
	com/ExcelWriter/PHPExcel/Shared/PCLZip/readme.txt
	com/ExcelWriter/PHPExcel/Shared/PDF/cache/utf8test.txt
	com/ExcelWriter/PHPExcel/Shared/PDF/fonts/almohanad.php
	com/ExcelWriter/PHPExcel/Shared/PDF/fonts/arialunicid0-chinese-simplified.php
	com/ExcelWriter/PHPExcel/Shared/PDF/fonts/arialunicid0-chinese-traditional.php
	com/ExcelWriter/PHPExcel/Shared/PDF/fonts/arialunicid0-japanese.php
	com/ExcelWriter/PHPExcel/Shared/PDF/fonts/arialunicid0-korean.php
	com/ExcelWriter/PHPExcel/Shared/PDF/fonts/arialunicid0.php
	com/ExcelWriter/PHPExcel/Shared/PDF/fonts/symbol.php
	com/ExcelWriter/PHPExcel/Shared/PDF/fonts/utils/makeallttffonts.php
	com/ExcelWriter/PHPExcel/Shared/PDF/fonts/utils/src/readme.txt
	com/ExcelWriter/PHPExcel/Shared/PDF/fonts/zapfdingbats.php
	com/ExcelWriter/PHPExcel/Shared/PDF/fonts/zarbold.php
	com/ExcelWriter/PHPExcel/Shared/PDF/images/bug.eps
2 parents 0bc96e44 daa1703d
......@@ -39,6 +39,18 @@ class HierarchicalMenu implements Countable, Iterator {
$last_id = $item->ID;
} elseif ($item->menu_item_parent == $last_id) {
if (!property_exists($this, 'contents')) {
$this->contents = array();
}
if (!isset($this->contents[$this->id_lookup[$last_id]])) {
$this->contents[$this->id_lookup[$last_id]] = new \StdClass;
}
if (!property_exists($this->contents[$this->id_lookup[$last_id]], '_children')) {
$this->contents[$this->id_lookup[$last_id]]->_children = null;
}
$this->contents[$this->id_lookup[$last_id]]->_children = true;
$this->contents[$this->id_lookup[$last_id]]->classes[] = 'menu-item-children';
$nest[] = $last_id;
......
......@@ -201,7 +201,7 @@ function send_triggered_notification($uid = 0, $trigger = "NO_TRIGGER", $args =
$notification->trigger = $details['trigger'];
$notification->status = isset($details['status']) ? $details['status'] : "active";
$notification->type = $details['type'];
$notification->sendto = $details['sendto'];
$notification->sendto = @$details['sendto'];
$notification->is_email = (($email['text'] != "" || $email['html'] != "") && $email['subject'] != "") ? true : false;
$notification->is_system = (isset($system['message']) && $system['message'] != "") ? true : false;
......@@ -255,7 +255,7 @@ function send_triggered_notification($uid = 0, $trigger = "NO_TRIGGER", $args =
$from_email = get_bloginfo('admin_email');
$subject = strip_tags($contents['subject']);
$html = $contents['html'];
$html = @$contents['html'];
$alttext = strip_tags($contents['text']);
foreach ($args as $key => $val) {
......