diff options
| -rw-r--r-- | include/functions_category.inc.php | 7 | ||||
| -rw-r--r-- | include/ws_functions.inc.php | 2 | ||||
| -rw-r--r-- | include/ws_protocols/rest_encoder.php | 1 | ||||
| -rw-r--r-- | template/yoga/fix-ie5-ie6.css | 5 | ||||
| -rw-r--r-- | template/yoga/fix-khtml.css | 6 | ||||
| -rw-r--r-- | template/yoga/menubar.css | 4 | ||||
| -rw-r--r-- | template/yoga/theme/admin/themeconf.inc.php | 6 |
7 files changed, 14 insertions, 17 deletions
diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php index c647d19ef..721cc0038 100644 --- a/include/functions_category.inc.php +++ b/include/functions_category.inc.php @@ -365,10 +365,9 @@ function get_cat_id_from_permalinks( $permalinks, &$idx ) $in .= '"'.$permalink.'"'; } $query =' -SELECT c.id, op.permalink, 1 AS is_old - FROM '.OLD_PERMALINKS_TABLE.' op INNER JOIN '.CATEGORIES_TABLE.' c - ON op.cat_id=c.id - WHERE op.permalink IN ('.$in.') +SELECT cat_id AS id, permalink, 1 AS is_old + FROM '.OLD_PERMALINKS_TABLE.' + WHERE permalink IN ('.$in.') UNION SELECT id, permalink, 0 AS is_old FROM '.CATEGORIES_TABLE.' diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php index 52456b799..2488fd0bf 100644 --- a/include/ws_functions.inc.php +++ b/include/ws_functions.inc.php @@ -865,7 +865,7 @@ function ws_session_logout($params, &$service) function ws_session_getStatus($params, &$service) { - global $user, $lang_info; + global $user; $res = array(); $res['username'] = is_a_guest() ? 'guest' : $user['username']; foreach ( array('status', 'template', 'theme', 'language') as $k ) diff --git a/include/ws_protocols/rest_encoder.php b/include/ws_protocols/rest_encoder.php index ab8ead344..e057c6427 100644 --- a/include/ws_protocols/rest_encoder.php +++ b/include/ws_protocols/rest_encoder.php @@ -152,7 +152,6 @@ class PwgRestEncoder extends PwgResponseEncoder { function encodeResponse($response) { - global $lang_info; $respClass = strtolower( get_class($response) ); if ($respClass=='pwgerror') { diff --git a/template/yoga/fix-ie5-ie6.css b/template/yoga/fix-ie5-ie6.css index a16290fcb..b78bc7bf4 100644 --- a/template/yoga/fix-ie5-ie6.css +++ b/template/yoga/fix-ie5-ie6.css @@ -16,11 +16,6 @@ H1, #theHeader { width: 99%; /* buggy IE box model */ } -/* fix tag clouds : IE doesn't like anything but inline */ -#menubar #menuTagCloud LI -{ - display: inline; -} /* fix quickconnect layout */ FORM#quickconnect FIELDSET { diff --git a/template/yoga/fix-khtml.css b/template/yoga/fix-khtml.css index ce35d70f3..29ffd1877 100644 --- a/template/yoga/fix-khtml.css +++ b/template/yoga/fix-khtml.css @@ -10,5 +10,11 @@ top: -1px; /* move the container up by the same amount */ margin-bottom: 5px; } + +#menubar #menuTagCloud LI +{ + display: inline-block;/* required for Safari 3.1 - otherwise overflows on the right */ +} + /* end Safari/Konqueror */ diff --git a/template/yoga/menubar.css b/template/yoga/menubar.css index 0e8185eeb..e676d5784 100644 --- a/template/yoga/menubar.css +++ b/template/yoga/menubar.css @@ -144,8 +144,6 @@ input#qsearchInput { #menubar #menuTagCloud LI { - display: inline; /* FF doesn't see the inline-block below */ + display: inline; white-space: nowrap; /* No line break in the LI but Opera set nowrap to */ - display: inline-block;/* the whole UL, inline-block fix it. */ - /* IE wants inline in fix-ie5-ie6.css */ } diff --git a/template/yoga/theme/admin/themeconf.inc.php b/template/yoga/theme/admin/themeconf.inc.php index ab68d89e3..5a6450e82 100644 --- a/template/yoga/theme/admin/themeconf.inc.php +++ b/template/yoga/theme/admin/themeconf.inc.php @@ -14,12 +14,12 @@ function selected_admin_menu() case 'cat_list': case 'cat_modify': case 'cat_move': - case 'cat_options': + case 'cat_options': case 'element_set': case 'cat_perm': case 'permalinks': case 'picture_modify': - if (isset($_GET['cat']) and $_GET['cat']='caddie') { + if (isset($_GET['cat']) and $_GET['cat']=='caddie') { return 3; } return 2; @@ -40,7 +40,7 @@ function selected_admin_menu() case 'plugins_list': case 'plugin': return 5; - } + } } return 0; } |