Skip to content

Commit

Permalink
Revert f5e52ec..f4aa24c
Browse files Browse the repository at this point in the history
This rolls back to commit f5e52ec.
  • Loading branch information
thomasbnielsen committed Nov 16, 2014
1 parent f4aa24c commit 4ea4c45
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions code/ContentBlocksModule.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public function OneBlock($id) {
}

// Run on dev buld
/* function requireDefaultRecords() {
function requireDefaultRecords() {
parent::requireDefaultRecords();

// If css file does not exist on current theme, copy from module
Expand All @@ -82,11 +82,11 @@ public function OneBlock($id) {
}
}
}
*/
/* public function contentcontrollerInit($controller) {

public function contentcontrollerInit($controller) {
Requirements::themedCSS('block');
}
*/

/**
* Simple support for Translatable, when a page is translated, copy all content blocks and relate to translated page
* TODO: This is not working as intended, for some reason an image is added to the duplicated block
Expand Down
8 changes: 4 additions & 4 deletions code/dataobjects/Block.php
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ function onAfterWrite() {

}

/* function requireDefaultRecords() {
function requireDefaultRecords() {
parent::requireDefaultRecords();
// Run on dev build - move to module file or why is it here?
Expand All @@ -186,7 +186,7 @@ function onAfterWrite() {
}
}
}
*/

// Should only unlink if a block is on more than one page
public function canDelete($member = null) {
if(!$member || !(is_a($member, 'Member')) || is_numeric($member)) $member = Member::currentUser();
Expand All @@ -213,7 +213,7 @@ public function canDelete($member = null) {
return $this->canEdit($member);
}

/* function recurse_copy($src,$dst) {
function recurse_copy($src,$dst) {
$dir = opendir($src);
@mkdir($dst);
while(false !== ( $file = readdir($dir)) ) {
Expand All @@ -228,7 +228,7 @@ public function canDelete($member = null) {
}
closedir($dir);
}
*/

/* TODO: add function to calculate image widths based on columns? */
public function ColumnClass($totalitems) {
$totalcolumns = 12; // should be configurable
Expand Down

0 comments on commit 4ea4c45

Please sign in to comment.