[geeklog-hg] geeklog: Fixed bug the select element have more than one selecte...

[geeklog-cvs at lists.geeklog.net]

changeset 8849:8a1e037c591f
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/8a1e037c591f
user: dengen
date: Mon Oct 01 12:33:43 2012 +0900
description:
Fixed bug the select element have more than one selected option descendant

diffstat:

 public_html/admin/story.php |  8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (18 lines):

diff -r 6128777f002d -r 8a1e037c591f public_html/admin/story.php
--- a/public_html/admin/story.php	Mon Oct 01 10:31:26 2012 +0900
+++ b/public_html/admin/story.php	Mon Oct 01 12:33:43 2012 +0900
@@ -672,7 +672,13 @@
     $story_templates->set_var('lang_publishoptions',$LANG24[76]);
     $story_templates->set_var('noscript', COM_getNoScript(false, $LANG24[77], sprintf($LANG24[78],$_CONF['site_admin_url'], $sid)));
     
-    $post_options = COM_optionList($_TABLES['postmodes'],'code,name',$story->EditElements('postmode'));
+    $postmode = $story->EditElements('postmode');
+    if ($_CONF['advanced_editor'] && $_USER['advanced_editor']) {
+        if ($story->EditElements('advanced_editor_mode') == 1 OR $story->EditElements('postmode') == 'adveditor') {
+            $postmode = '';
+        }
+    }
+    $post_options = COM_optionList($_TABLES['postmodes'],'code,name',$postmode);
 
     // If Advanced Mode - add post option and set default if editing story created with Advanced Editor
     if ($_CONF['advanced_editor'] && $_USER['advanced_editor']) {