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
Showing
2 changed files
with
14 additions
and
2 deletions
| ... | @@ -39,6 +39,18 @@ class HierarchicalMenu implements Countable, Iterator { | ... | @@ -39,6 +39,18 @@ class HierarchicalMenu implements Countable, Iterator { |
| 39 | 39 | ||
| 40 | $last_id = $item->ID; | 40 | $last_id = $item->ID; |
| 41 | } elseif ($item->menu_item_parent == $last_id) { | 41 | } elseif ($item->menu_item_parent == $last_id) { |
| 42 | if (!property_exists($this, 'contents')) { | ||
| 43 | $this->contents = array(); | ||
| 44 | } | ||
| 45 | |||
| 46 | if (!isset($this->contents[$this->id_lookup[$last_id]])) { | ||
| 47 | $this->contents[$this->id_lookup[$last_id]] = new \StdClass; | ||
| 48 | } | ||
| 49 | |||
| 50 | if (!property_exists($this->contents[$this->id_lookup[$last_id]], '_children')) { | ||
| 51 | $this->contents[$this->id_lookup[$last_id]]->_children = null; | ||
| 52 | } | ||
| 53 | |||
| 42 | $this->contents[$this->id_lookup[$last_id]]->_children = true; | 54 | $this->contents[$this->id_lookup[$last_id]]->_children = true; |
| 43 | $this->contents[$this->id_lookup[$last_id]]->classes[] = 'menu-item-children'; | 55 | $this->contents[$this->id_lookup[$last_id]]->classes[] = 'menu-item-children'; |
| 44 | $nest[] = $last_id; | 56 | $nest[] = $last_id; | ... | ... |
| ... | @@ -201,7 +201,7 @@ function send_triggered_notification($uid = 0, $trigger = "NO_TRIGGER", $args = | ... | @@ -201,7 +201,7 @@ function send_triggered_notification($uid = 0, $trigger = "NO_TRIGGER", $args = |
| 201 | $notification->trigger = $details['trigger']; | 201 | $notification->trigger = $details['trigger']; |
| 202 | $notification->status = isset($details['status']) ? $details['status'] : "active"; | 202 | $notification->status = isset($details['status']) ? $details['status'] : "active"; |
| 203 | $notification->type = $details['type']; | 203 | $notification->type = $details['type']; |
| 204 | $notification->sendto = $details['sendto']; | 204 | $notification->sendto = @$details['sendto']; |
| 205 | $notification->is_email = (($email['text'] != "" || $email['html'] != "") && $email['subject'] != "") ? true : false; | 205 | $notification->is_email = (($email['text'] != "" || $email['html'] != "") && $email['subject'] != "") ? true : false; |
| 206 | $notification->is_system = (isset($system['message']) && $system['message'] != "") ? true : false; | 206 | $notification->is_system = (isset($system['message']) && $system['message'] != "") ? true : false; |
| 207 | 207 | ||
| ... | @@ -255,7 +255,7 @@ function send_triggered_notification($uid = 0, $trigger = "NO_TRIGGER", $args = | ... | @@ -255,7 +255,7 @@ function send_triggered_notification($uid = 0, $trigger = "NO_TRIGGER", $args = |
| 255 | 255 | ||
| 256 | $from_email = get_bloginfo('admin_email'); | 256 | $from_email = get_bloginfo('admin_email'); |
| 257 | $subject = strip_tags($contents['subject']); | 257 | $subject = strip_tags($contents['subject']); |
| 258 | $html = $contents['html']; | 258 | $html = @$contents['html']; |
| 259 | $alttext = strip_tags($contents['text']); | 259 | $alttext = strip_tags($contents['text']); |
| 260 | 260 | ||
| 261 | foreach ($args as $key => $val) { | 261 | foreach ($args as $key => $val) { | ... | ... |
-
Please register or sign in to post a comment