[geeklog-cvs] geeklog: Update to support a new CONFIG parm that will bring bac...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/0e60778aa4ae
changeset: 6703:0e60778aa4ae
user:      blaine
date:      Tue Jan 20 00:17:45 2009 -0500
description:
Update to support a new CONFIG parm that will bring back the separate setting for Allowable HTML if advanced Editor is enabled and your have story.edit permissions.

diffstat:

1 file changed, 8 insertions(+), 2 deletions(-)
public_html/lib-common.php |   10 ++++++++--

diffs (20 lines):

diff -r 70033dba2376 -r 0e60778aa4ae public_html/lib-common.php
--- a/public_html/lib-common.php	Mon Jan 19 22:19:19 2009 -0500
+++ b/public_html/lib-common.php	Tue Jan 20 00:17:45 2009 -0500
@@ -2985,8 +2985,14 @@
     }
     else
     {
-        $html = array_merge_recursive( $_CONF['user_html'],
-                                       $_CONF['admin_html'] );
+        if ($_CONF['advanced_editor']) {
+            $html = array_merge_recursive( $_CONF['user_html'],
+                                           $_CONF['admin_html'],
+                                           $_CONF['advanced_html'] );
+        } else {
+            $html = array_merge_recursive( $_CONF['user_html'],
+                                           $_CONF['admin_html'] );
+        }
     }
 
     foreach( $html as $tag => $attr )