[TWiki-Dev] [SVN] HideyoImazu r25973 - twiki/trunk/core/lib/TWiki/UI

[<de...@de...>]

Author: HideyoImazu
Date: 2013-05-23 02:42:14 -0500 (Thu, 23 May 2013)
New Revision: 25973
Trac url: http://develop.twiki.org/trac/changeset/25973

Modified:
   twiki/trunk/core/lib/TWiki/UI/Edit.pm
Log:
Item7264: The edit script to edit ABC.DEF topic if it exists even if the subweb ABC/DEF exists

Modified: twiki/trunk/core/lib/TWiki/UI/Edit.pm
===================================================================
--- twiki/trunk/core/lib/TWiki/UI/Edit.pm	2013-05-23 07:19:06 UTC (rev 25972)
+++ twiki/trunk/core/lib/TWiki/UI/Edit.pm	2013-05-23 07:42:14 UTC (rev 25973)
@@ -100,7 +100,8 @@
 
     TWiki::UI::checkWebExists( $session, $webName, $topic, 'edit' );
     TWiki::UI::checkWebWritable( $session );
-    if ( $store->webExists( $webName.'/'.$topic ) ) {
+    my $topicExists = $store->topicExists( $webName, $topic );
+    if ( !$topicExists && $store->webExists( $webName.'/'.$topic ) ) {
         throw TWiki::OopsException(
             'attention',
             def => 'web_exists_topic_edit',
@@ -112,7 +113,6 @@
     my $text = '';
     my $meta = '';
     my $extra = '';
-    my $topicExists  = $store->topicExists( $webName, $topic );
 
     # If you want to edit, you have to be able to view and change.
     TWiki::UI::checkAccess( $session, $webName, $topic, 'VIEW', $user );