tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:silverstripe/sapphire

Browse Source
This commit is contained in:
Sam Minnee 2012-03-09 17:50:41 +13:00
commit 7fd90c1b01
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/code/CMSMenu.php
View File

@ -101,7 +101,7 @@ class CMSMenu extends Object implements IteratorAggregate, i18nEntityProvider
/** /**
* Add an arbitrary URL to the CMS menu. * Add an arbitrary URL to the CMS menu.
* *
* @param string $code A unique identifier (used to create a CSS ID and as it's key in {@link $menu_items} * @param string $code A unique identifier (used to create a CSS ID and its key in {@link $menu_items})
* @param string $menuTitle The link's title in the CMS menu * @param string $menuTitle The link's title in the CMS menu
* @param string $url The url of the link * @param string $url The url of the link
* @param integer $priority The menu priority (sorting order) of the menu item. Higher priorities will be further left. * @param integer $priority The menu priority (sorting order) of the menu item. Higher priorities will be further left.

12
dev/install/install.php5
View File

@ -1047,14 +1047,14 @@ require_once('conf/ConfigureFromEnv.php');
MySQLDatabase::set_connection_charset('utf8'); MySQLDatabase::set_connection_charset('utf8');
// This line set's the current theme. More themes can be // Set the current theme. More themes can be downloaded from
// downloaded from http://www.silverstripe.org/themes/ // http://www.silverstripe.org/themes/
SSViewer::set_theme('$theme'); SSViewer::set_theme('$theme');
// Set the site locale // Set the site locale
i18n::set_locale('$locale'); i18n::set_locale('$locale');
// enable nested URLs for this site (e.g. page/sub-page/) // Enable nested URLs for this site (e.g. page/sub-page/)
if (class_exists('SiteTree')) SiteTree::enable_nested_urls(); if (class_exists('SiteTree')) SiteTree::enable_nested_urls();
PHP PHP
); );
@ -1080,14 +1080,14 @@ global \$databaseConfig;
MySQLDatabase::set_connection_charset('utf8'); MySQLDatabase::set_connection_charset('utf8');
// This line set's the current theme. More themes can be // Set the current theme. More themes can be downloaded from
// downloaded from http://www.silverstripe.org/themes/ // http://www.silverstripe.org/themes/
SSViewer::set_theme('$theme'); SSViewer::set_theme('$theme');
// Set the site locale // Set the site locale
i18n::set_locale('$locale'); i18n::set_locale('$locale');
// enable nested URLs for this site (e.g. page/sub-page/) // Enable nested URLs for this site (e.g. page/sub-page/)
if (class_exists('SiteTree')) SiteTree::enable_nested_urls(); if (class_exists('SiteTree')) SiteTree::enable_nested_urls();
PHP PHP
); );

2
security/Member.php
View File

@ -659,7 +659,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
$encryption_details = Security::encrypt_password( $encryption_details = Security::encrypt_password(
$this->Password, // this is assumed to be cleartext $this->Password, // this is assumed to be cleartext
$this->Salt, $this->Salt,
$this->PasswordEncryption, ($this->PasswordEncryption) ? $this->PasswordEncryption : Security::get_password_encryption_algorithm(),
$this $this
); );

2
view/SSViewer.php
View File

@ -328,7 +328,7 @@ class SSViewer_DataPresenter extends SSViewer_Scope {
if ($createObject) $implementer = new $implementer(); if ($createObject) $implementer = new $implementer();
// Get the exposed variables // Get the exposed variables
$exposedVariables = $implementer::$variableMethod(); $exposedVariables = call_user_func(array($implementer, $variableMethod));
foreach($exposedVariables as $varName => $details) { foreach($exposedVariables as $varName => $details) {
if (!is_array($details)) $details = array('method' => $details, 'casting' => Object::get_static('ViewableData', 'default_cast')); if (!is_array($details)) $details = array('method' => $details, 'casting' => Object::get_static('ViewableData', 'default_cast'));