# HG changeset patch
# User Dan
# Date 1263163007 18000
# Node ID 7f0d9fa561f4b97d65a3971edae79bb4e2e6dec0
# Parent  af40ef1982dd59918d0eb174b8d2ebd0feac97ec# Parent  1cbefc789a467aad2771a7d370483e41e2c37796
Merge from accidental split

diff -r af40ef1982dd -r 7f0d9fa561f4 plugins/Newsboy.php
--- a/plugins/Newsboy.php	Sun Jan 10 17:36:29 2010 -0500
+++ b/plugins/Newsboy.php	Sun Jan 10 17:36:47 2010 -0500
@@ -718,7 +718,8 @@
             $time = mktime($hour, $minute, $second, $month, $day, $year);
           }
           
-          if ( isset($paths->pages[ $paths->nslist['NewsBoy'] . $time ]) && $paths->pages[ $paths->nslist['NewsBoy'] . $time ] != $paths->pages[ $paths->nslist['NewsBoy'] . $_POST['page_id'] ] )
+          $time_changed = $time !== intval($_POST['page_id']);
+          if ( isPage($paths->nslist['NewsBoy'] . $time) && $time_changed ) // $paths->pages[ $paths->nslist['NewsBoy'] . $time ] != $paths->pages[ $paths->nslist['NewsBoy'] . $_POST['page_id'] ] )
             $errors[] = 'You cannot have two news articles with the same publish time.';
           
           if ( count($errors) < 1 )
@@ -763,12 +764,13 @@
           echo '<div class="warning-box">Errors encountered while saving data:<ul><li>' . implode('</li><li>', $errors) . '</li></ul></div>';
         
         // Obtain page information
-        if ( !isset($paths->pages[ $paths->nslist['NewsBoy'] . $_GET['id'] ]) )
+        if ( !isPage($paths->nslist['NewsBoy'] . $_GET['id']) )
         {
           echo 'Invalid ID';
           return false;
         }
-        $page_info =& $paths->pages[ $paths->nslist['NewsBoy'] . $_GET['id'] ];
+        $page = namespace_factory($_GET['id'], 'NewsBoy');
+        $page_info = $page->get_cdata();
         $time = intval($page_info['urlname_nons']);
         
         // Get author