diff --git a/symphony/content/content.blueprintsdatasources.php b/symphony/content/content.blueprintsdatasources.php index fad0344..3b37a34 100644 --- a/symphony/content/content.blueprintsdatasources.php +++ b/symphony/content/content.blueprintsdatasources.php @@ -437,7 +437,7 @@ function __form(){ $label = Widget::Label(); $input = Widget::Input('fields[max_records]', $fields['max_records'], NULL, array('size' => '6')); - $label->setValue(__('Show a maximum of %s results', array($input->generate(false)))); + $label->setValue(__('Show a maximum of %s results per page', array($input->generate(false)))); if(isset($this->_errors['max_records'])) $div->appendChild(Widget::wrapFormElementWithError($label, $this->_errors['max_records'])); else $div->appendChild($label); @@ -1177,4 +1177,4 @@ function __appendAuthorFilter(&$wrapper, $h4_label, $name, $value=NULL, $templat } } - \ No newline at end of file + diff --git a/symphony/content/content.blueprintssections.php b/symphony/content/content.blueprintssections.php index 1b18dd3..a950d41 100644 --- a/symphony/content/content.blueprintssections.php +++ b/symphony/content/content.blueprintssections.php @@ -127,7 +127,7 @@ public function __viewNew(){ $label = Widget::Label(); $input = Widget::Input('meta[hidden]', 'yes', 'checkbox', ($meta['hidden'] == 'yes' ? array('checked' => 'checked') : NULL)); - $label->setValue(__('%s Hide this section from the Publish menu', array($input->generate(false)))); + $label->setValue(__('%s Hide this section from the back-end menu', array($input->generate(false)))); $namediv->appendChild($label); $div->appendChild($namediv); diff --git a/symphony/lib/toolkit/fields/field.upload.php b/symphony/lib/toolkit/fields/field.upload.php index 02bf13e..3ab3a8c 100755 --- a/symphony/lib/toolkit/fields/field.upload.php +++ b/symphony/lib/toolkit/fields/field.upload.php @@ -491,6 +491,7 @@ public static function getMetaInfo($file, $type){ 'image/gif', 'image/jpg', 'image/jpeg', + 'image/pjpeg', 'image/png', ); diff --git a/symphony/lib/toolkit/include.install.php b/symphony/lib/toolkit/include.install.php index 2c47d1b..03696bb 100644 --- a/symphony/lib/toolkit/include.install.php +++ b/symphony/lib/toolkit/include.install.php @@ -15,7 +15,7 @@ define('__IN_SYMPHONY__', true); define('DOCROOT', './'); - $rewrite_base = trim(dirname($_SERVER['PHP_SELF']), DIRECTORY_SEPARATOR); + $rewrite_base = trim(dirname($_SERVER['PHP_SELF']), '/\\'); if(strlen($rewrite_base) > 0){ $rewrite_base .= '/';