Merge branch 'integration' of github.com:symphonycms/symphony-2 into …

…integration
builders · Aug 13, 2010 · 28fd169 · 28fd169
2 parents 2b6047e + 1bb3fe9
commit 28fd169
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git 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
 		}
 
 	}
-
+
diff --git 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
@@ -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
@@ -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 .= '/';