diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php index ee024510f..8f50fcbff 100644 --- a/e107_admin/cpage.php +++ b/e107_admin/cpage.php @@ -159,7 +159,7 @@ class page_chapters_ui extends e_admin_ui 'chapter_name' => array('title'=> CUSLAN_53, 'type' => 'method', 'width' => 'auto', 'thclass' => 'left', 'readonly'=>FALSE, 'writeParms'=>'size=xxlarge'), 'chapter_template' => array('title'=> LAN_TEMPLATE, 'type' => 'dropdown', 'width' => 'auto','filter' => true, 'batch'=>true, 'inline'=>true, 'writeParms'=>''), - 'chapter_meta_description' => array('title'=> LAN_DESCRIPTION, 'type' => 'textarea', 'width' => 'auto', 'thclass' => 'left','readParms' => 'expand=...&truncate=150&bb=1', 'readonly'=>FALSE), + 'chapter_meta_description' => array('title'=> LAN_DESCRIPTION, 'type' => 'textarea', 'width' => 'auto', 'thclass' => 'left','readParms' => 'expand=...&truncate=150&bb=1', 'writeParms'=>'size=xxlarge', 'readonly'=>FALSE), 'chapter_meta_keywords' => array('title'=> LAN_KEYWORDS, 'type' => 'tags', 'inline'=>true, 'width' => 'auto', 'thclass' => 'left', 'readonly'=>FALSE), 'chapter_sef' => array('title'=> LAN_SEFURL, 'type' => 'text', 'width' => 'auto', 'readonly'=>FALSE, 'inline'=>true, 'writeParms'=>'size=xxlarge&inline-empty=1'), // Display name 'chapter_manager' => array('title'=> CUSLAN_55, 'type' => 'userclass', 'inline'=>true, 'width' => 'auto', 'data' => 'int','batch'=>TRUE, 'filter'=>TRUE), diff --git a/e107_admin/image.php b/e107_admin/image.php index 1db05fd6a..42ff11df9 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -1482,7 +1482,7 @@ class media_admin_ui extends e_admin_ui - if(vartrue($parm['search'])) + if(!empty($parm['search'])) { $filtered = array(); if(!empty($items)) diff --git a/e107_core/shortcodes/batch/news_shortcodes.php b/e107_core/shortcodes/batch/news_shortcodes.php index 62a6577e7..1200b7f79 100644 --- a/e107_core/shortcodes/batch/news_shortcodes.php +++ b/e107_core/shortcodes/batch/news_shortcodes.php @@ -510,7 +510,7 @@ class news_shortcodes extends e_shortcode $class = varset($parm['class']); - return "".$adop_icon."\n"; + return "".$adop_icon."\n"; } else { diff --git a/index.php b/index.php index 35d75406c..b9bae8c0f 100644 --- a/index.php +++ b/index.php @@ -86,8 +86,19 @@ */ $sql->db_Mark_Time("Start Simple URL-ReWrite Routine"); - - $tmp = e107::getAddonConfig('e_url'); + + // XXX Cache didn't bring much benefit. + + /*if($cached = e107::getCache()->retrieve('Addon_url',5,true,true)) + { + $tmp = e107::unserialize($cached); + } + else*/ + { + $tmp = e107::getAddonConfig('e_url'); + // e107::getCache()->set('Addon_url',e107::serialize($tmp,'json'),true,true,true); + } + $req = (e_HTTP === '/') ? ltrim(e_REQUEST_URI,'/') : str_replace(e_HTTP,'', e_REQUEST_URI) ;