equal
deleted
inserted
replaced
433 else |
433 else |
434 { |
434 { |
435 // Page format is XHTML. This means we want to disable functionality that MCE takes care of, while still retaining |
435 // Page format is XHTML. This means we want to disable functionality that MCE takes care of, while still retaining |
436 // the ability to wikilink, the ability to use images, etc. Basically, RENDER_INLINEONLY disables all behavior in |
436 // the ability to wikilink, the ability to use images, etc. Basically, RENDER_INLINEONLY disables all behavior in |
437 // the rendering engine/Text_Wiki that conflicts with MCE. |
437 // the rendering engine/Text_Wiki that conflicts with MCE. |
438 $text = '?>' . RenderMan::render($text, RENDER_WIKI_DEFAULT | RENDER_INLINEONLY); |
438 $text = '?>' . RenderMan::render($text, RENDER_INLINE); |
439 } |
439 } |
440 } |
440 } |
441 else |
441 else |
442 { |
442 { |
443 $text = '?>' . $text; |
443 $text = '?>' . $text; |
531 <!-- End breadcrumbs --> |
531 <!-- End breadcrumbs --> |
532 '; |
532 '; |
533 } |
533 } |
534 } |
534 } |
535 |
535 |
536 public function error_404($userpage = false) |
536 public function error_404() |
537 { |
537 { |
538 global $db, $session, $paths, $template, $plugins; // Common objects |
538 global $db, $session, $paths, $template, $plugins; // Common objects |
539 global $lang, $output; |
539 global $lang, $output; |
|
540 |
|
541 $userpage = $this->namespace == 'User'; |
540 |
542 |
541 @header('HTTP/1.1 404 Not Found'); |
543 @header('HTTP/1.1 404 Not Found'); |
542 |
544 |
543 $msg = ( $pp = $paths->sysmsg('Page_not_found') ) ? $pp : '{STANDARD404}'; |
545 $msg = ( $pp = $paths->sysmsg('Page_not_found') ) ? $pp : '{STANDARD404}'; |
544 |
546 |