This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Index: sapphire/dev/TestRunner.php | |
| =================================================================== | |
| --- sapphire/dev/TestRunner.php (revision 98430) | |
| +++ sapphire/dev/TestRunner.php (working copy) | |
| @@ -206,6 +206,18 @@ | |
| * @param boolean $coverage | |
| */ | |
| function runTests($classList, $coverage = false) { | |
| + if(!empty($_GET['testdb'])) { | |
| + if(class_exists($_GET['testdb']) && is_subclass_of($_GET['testdb'], 'SS_Database')) { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Index: sapphire/email/Mailer.php | |
| =================================================================== | |
| --- sapphire/email/Mailer.php (revision 99637) | |
| +++ sapphire/email/Mailer.php (working copy) | |
| @@ -72,7 +72,7 @@ | |
| $headers["Content-Type"] = "text/plain; charset=\"utf-8\""; | |
| $headers["Content-Transfer-Encoding"] = $plainEncoding ? $plainEncoding : "quoted-printable"; | |
| - $plainPart = processHeaders($headers, ($plainEncoding == "base64") ? chunk_split(base64_encode($plainContent),60) : wordwrap($plainContent,120)); | |
| + $plainPart = processHeaders($headers, ($plainEncoding == "base64") ? chunk_split(base64_encode($plainContent),60) : quoted_printable_encode($plainContent)); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Index: cms/code/LeftAndMain.php | |
| =================================================================== | |
| --- cms/code/LeftAndMain.php (revision 99837) | |
| +++ cms/code/LeftAndMain.php (working copy) | |
| @@ -484,7 +484,7 @@ | |
| // NOTE: SiteTree/CMSMain coupling :-( | |
| SiteTree::prepopuplate_permission_cache('edit', $obj->markedNodeIDs()); | |
| - SiteTree::prepopuplate_permission_cache('delete', $obj->markedNodeIDs()); | |
| + //SiteTree::prepopuplate_permission_cache('delete', $obj->markedNodeIDs()); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Index: cms/code/LeftAndMain.php | |
| =================================================================== | |
| --- cms/code/LeftAndMain.php (revision 99837) | |
| +++ cms/code/LeftAndMain.php (working copy) | |
| @@ -484,7 +484,6 @@ | |
| // NOTE: SiteTree/CMSMain coupling :-( | |
| SiteTree::prepopuplate_permission_cache('edit', $obj->markedNodeIDs()); | |
| - SiteTree::prepopuplate_permission_cache('delete', $obj->markedNodeIDs()); | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Index: sapphire/core/model/VirtualPage.php | |
| =================================================================== | |
| --- sapphire/core/model/VirtualPage.php (revision 99837) | |
| +++ sapphire/core/model/VirtualPage.php (working copy) | |
| @@ -209,13 +209,12 @@ | |
| * @return mixed | |
| */ | |
| function __get($field) { | |
| - $return = parent::__get($field); | |
| - if ($return === null) { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Index: sapphire/forms/TableListField.php | |
| =================================================================== | |
| --- sapphire/forms/TableListField.php (revision 100001) | |
| +++ sapphire/forms/TableListField.php (working copy) | |
| @@ -777,13 +777,29 @@ | |
| return $this->extraLinkParams; | |
| } | |
| + /** | |
| + * Base link for this table field that includes the current sort information, but no pagination |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Index: sapphire/core/model/SiteTree.php | |
| =================================================================== | |
| --- sapphire/core/model/SiteTree.php (revision 100671) | |
| +++ sapphire/core/model/SiteTree.php (working copy) | |
| @@ -1313,6 +1313,14 @@ | |
| $this->syncLinkTracking(); | |
| + // Check to see if we've only altered fields that shouldn't affect versioning | |
| + $fieldsIgnoredByVersioning = array('HasBrokenLink', 'Status', 'HasBrokenFile', 'ToDo'); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Index: subsites/code/Subsite.php | |
| =================================================================== | |
| --- subsites/code/Subsite.php (revision 100863) | |
| +++ subsites/code/Subsite.php (working copy) | |
| @@ -74,6 +74,11 @@ | |
| */ | |
| protected static $allowed_themes = array(); | |
| + /** | |
| + * Memory cache of accessible sites |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Index: subsites/code/Subsite.php | |
| =================================================================== | |
| --- subsites/code/Subsite.php (revision 100863) | |
| +++ subsites/code/Subsite.php (working copy) | |
| @@ -74,6 +74,11 @@ | |
| */ | |
| protected static $allowed_themes = array(); | |
| + /** | |
| + * Memory cache of accessible sites |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Index: sapphire/core/SSViewer.php | |
| =================================================================== | |
| --- sapphire/core/SSViewer.php (revision 100762) | |
| +++ sapphire/core/SSViewer.php (working copy) | |
| @@ -387,6 +387,11 @@ | |
| return $output; | |
| } | |
| + | |
| + static function execute_template($template, $data) { |